From e9a7c6c53e4f24d0f51effea0fd29b1265e60adf Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Wed, 11 May 2022 07:46:34 -0500
Subject: [PATCH 001/101] Initial commit for governance

---
 .env.example                                  |    4 +-
 actions/Memo.tsx                              |   52 +
 actions/RawTX.tsx                             |   57 +
 actions/types.tsx                             |   65 +
 components/AsyncButton.tsx                    |   39 +
 components/HelperCard.tsx                     |   32 +
 components/LabeledInput.tsx                   |   43 +
 components/Modal/ModalButton.tsx              |   45 +
 components/Modal/ModalInner.tsx               |   54 +
 components/Modal/context.tsx                  |   16 +
 components/Modal/index.tsx                    |  113 +
 .../Proposals/ProposalCreateView/index.tsx    |    5 +
 .../ProposalConfirmationModal/ProposalIX.tsx  |   23 +
 .../ProposalConfirmationModal/index.tsx       |  124 +
 .../locked-voter/ProposalCreateInner.tsx      |  246 ++
 .../locked-voter/ProposalTXForm.tsx           |   97 +
 .../ProposalCreateView/locked-voter/index.tsx |   25 +
 .../ActiveProposalVotingBars.tsx              |   67 +
 .../Proposals/ProposalsList/PageNav.tsx       |   63 +
 .../ProposalsList/PlaceholderCard.tsx         |   39 +
 .../Proposals/ProposalsList/ProposalCard.tsx  |   86 +
 .../ProposalsList/ProposalStateBadge.tsx      |   59 +
 .../ProposalsList/ProposalStateDate.tsx       |   72 +
 .../ProposalsList/ProposalStateLabel.tsx      |   43 +
 .../ProposalsList/ProposalSubtitle.tsx        |   32 +
 components/Proposals/ProposalsList/index.tsx  |  142 ++
 helpers/constants.ts                          |    9 +
 helpers/currencies.ts                         |  105 +
 helpers/fetchers.ts                           |   28 +
 helpers/format.ts                             |  249 ++
 helpers/idl/ve_honey.json                     |  707 +++++-
 .../instructions/parseNonAnchorInstruction.ts |  145 ++
 helpers/instructions/token/parsers.ts         |  115 +
 helpers/instructions/token/types.ts           |  237 ++
 .../upgradeable_loader/instructions.ts        |  223 ++
 .../upgradeable_loader/parsers.ts             |   72 +
 .../instructions/upgradeable_loader/types.ts  |  188 ++
 helpers/parser.ts                             |   66 +
 helpers/programs/veHoney.ts                   |   22 +
 helpers/sdk/constant.ts                       |   31 +
 helpers/sdk/gov.ts                            |   84 +
 helpers/sdk/index.ts                          |    1 +
 helpers/sdk/vehoney.ts                        |  193 +-
 helpers/types/ve_honey.ts                     | 2008 ++++++++++++++---
 helpers/utils.ts                              |  281 ++-
 helpers/validators/pubkey.ts                  |   49 +
 hooks/deploydao/stripTrailingNullBytes.ts     |    9 +
 hooks/deploydao/types.ts                      |  174 ++
 .../deploydao/useCanonicalVerifiableBuild.ts  |   19 +
 hooks/deploydao/useProgramData.ts             |   57 +
 hooks/deploydao/useProgramIndex.ts            |   21 +
 hooks/deploydao/useProgramMeta.ts             |   29 +
 hooks/deploydao/useProgramRelease.ts          |   20 +
 hooks/tribeca/useEscrow.ts                    |   99 +
 hooks/tribeca/useExecutiveCouncil.ts          |   92 +
 hooks/tribeca/useGovernor.ts                  |  180 ++
 hooks/tribeca/useProposalVotes.ts             |    3 +
 hooks/tribeca/useProposals.ts                 |  265 +++
 hooks/tribeca/useVote.ts                      |   23 +
 hooks/useIDLs.ts                              |   34 +
 hooks/useParsedInstruction.ts                 |  195 ++
 hooks/useProgramMeta.ts                       |   40 +
 hooks/useSmartWalletAddress.tsx               |   35 +
 icons/PulsingDot.tsx                          |   35 +
 package.json                                  |   13 +-
 pages/_app.tsx                                |   66 +-
 pages/governance/index.tsx                    |  115 +-
 pages/governance/proposals/create.tsx         |   13 +
 pages/governance/proposals/index.tsx          |   16 +
 yarn.lock                                     |  786 ++++++-
 70 files changed, 8358 insertions(+), 437 deletions(-)
 create mode 100644 actions/Memo.tsx
 create mode 100644 actions/RawTX.tsx
 create mode 100644 actions/types.tsx
 create mode 100644 components/AsyncButton.tsx
 create mode 100644 components/HelperCard.tsx
 create mode 100644 components/LabeledInput.tsx
 create mode 100644 components/Modal/ModalButton.tsx
 create mode 100644 components/Modal/ModalInner.tsx
 create mode 100644 components/Modal/context.tsx
 create mode 100644 components/Modal/index.tsx
 create mode 100644 components/Proposals/ProposalCreateView/index.tsx
 create mode 100644 components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
 create mode 100644 components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
 create mode 100644 components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
 create mode 100644 components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
 create mode 100644 components/Proposals/ProposalCreateView/locked-voter/index.tsx
 create mode 100644 components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
 create mode 100644 components/Proposals/ProposalsList/PageNav.tsx
 create mode 100644 components/Proposals/ProposalsList/PlaceholderCard.tsx
 create mode 100644 components/Proposals/ProposalsList/ProposalCard.tsx
 create mode 100644 components/Proposals/ProposalsList/ProposalStateBadge.tsx
 create mode 100644 components/Proposals/ProposalsList/ProposalStateDate.tsx
 create mode 100644 components/Proposals/ProposalsList/ProposalStateLabel.tsx
 create mode 100644 components/Proposals/ProposalsList/ProposalSubtitle.tsx
 create mode 100644 components/Proposals/ProposalsList/index.tsx
 create mode 100644 helpers/constants.ts
 create mode 100644 helpers/currencies.ts
 create mode 100644 helpers/fetchers.ts
 create mode 100644 helpers/format.ts
 create mode 100644 helpers/instructions/parseNonAnchorInstruction.ts
 create mode 100644 helpers/instructions/token/parsers.ts
 create mode 100644 helpers/instructions/token/types.ts
 create mode 100644 helpers/instructions/upgradeable_loader/instructions.ts
 create mode 100644 helpers/instructions/upgradeable_loader/parsers.ts
 create mode 100644 helpers/instructions/upgradeable_loader/types.ts
 create mode 100644 helpers/parser.ts
 create mode 100644 helpers/programs/veHoney.ts
 create mode 100644 helpers/sdk/gov.ts
 create mode 100644 helpers/validators/pubkey.ts
 create mode 100644 hooks/deploydao/stripTrailingNullBytes.ts
 create mode 100644 hooks/deploydao/types.ts
 create mode 100644 hooks/deploydao/useCanonicalVerifiableBuild.ts
 create mode 100644 hooks/deploydao/useProgramData.ts
 create mode 100644 hooks/deploydao/useProgramIndex.ts
 create mode 100644 hooks/deploydao/useProgramMeta.ts
 create mode 100644 hooks/deploydao/useProgramRelease.ts
 create mode 100644 hooks/tribeca/useEscrow.ts
 create mode 100644 hooks/tribeca/useExecutiveCouncil.ts
 create mode 100644 hooks/tribeca/useGovernor.ts
 create mode 100644 hooks/tribeca/useProposalVotes.ts
 create mode 100644 hooks/tribeca/useProposals.ts
 create mode 100644 hooks/tribeca/useVote.ts
 create mode 100644 hooks/useIDLs.ts
 create mode 100644 hooks/useParsedInstruction.ts
 create mode 100644 hooks/useProgramMeta.ts
 create mode 100644 hooks/useSmartWalletAddress.tsx
 create mode 100644 icons/PulsingDot.tsx
 create mode 100644 pages/governance/proposals/create.tsx
 create mode 100644 pages/governance/proposals/index.tsx

diff --git a/.env.example b/.env.example
index 323b8d9c..2a54c320 100644
--- a/.env.example
+++ b/.env.example
@@ -1 +1,3 @@
-NEXT_PUBLIC_RPC_NODE = 'https://api.mainnet-beta.solana.com'
\ No newline at end of file
+NEXT_PUBLIC_RPC_NODE = 'https://api.mainnet-beta.solana.com'
+NEXT_PUBLIC_GOVERNOR_ADDRESS=
+NEXT_PUBLIC_SMART_WALLET_ADDRESS=
\ No newline at end of file
diff --git a/actions/Memo.tsx b/actions/Memo.tsx
new file mode 100644
index 00000000..0691c4e0
--- /dev/null
+++ b/actions/Memo.tsx
@@ -0,0 +1,52 @@
+import {
+  buildStubbedTransaction,
+  createMemoInstruction
+} from '@saberhq/solana-contrib';
+import { useSolana } from '@saberhq/use-solana';
+import { useEffect, useState } from 'react';
+import { Text, Textarea } from 'degen';
+import { serializeToBase64 } from 'helpers/utils';
+import type { ActionFormProps } from './types';
+
+export const Memo: React.FC<ActionFormProps> = ({
+  actor,
+  setError,
+  setTxRaw
+}: ActionFormProps) => {
+  const [memo, setMemo] = useState<string>('');
+  const { network } = useSolana();
+
+  useEffect(() => {
+    if (memo === '') {
+      setError('Memo cannot be empty');
+    }
+  }, [memo, setError]);
+
+  return (
+    <>
+      <Textarea
+        id="memo"
+        // tw="h-auto"
+        label="Memo"
+        rows={4}
+        placeholder="The memo for the DAO to send."
+        value={memo}
+        onChange={e => {
+          setMemo(e.target.value);
+          try {
+            const txStub = buildStubbedTransaction(
+              network !== 'localnet' ? network : 'devnet',
+              [createMemoInstruction(e.target.value, [actor])]
+            );
+            setTxRaw(serializeToBase64(txStub));
+            setError(null);
+          } catch (ex) {
+            setTxRaw('');
+            console.debug('Error creating memo', ex);
+            setError('Memo is too long');
+          }
+        }}
+      />
+    </>
+  );
+};
diff --git a/actions/RawTX.tsx b/actions/RawTX.tsx
new file mode 100644
index 00000000..5d8d5494
--- /dev/null
+++ b/actions/RawTX.tsx
@@ -0,0 +1,57 @@
+import { extractErrorMessage } from '@saberhq/sail';
+import { Transaction } from '@solana/web3.js';
+import { Box, Text, Textarea } from 'degen';
+
+import { HelperCard } from 'components/HelperCard';
+import type { ActionFormProps } from './types';
+
+export const RawTX: React.FC<ActionFormProps> = ({
+  setError,
+  txRaw,
+  setTxRaw
+}: ActionFormProps) => {
+  return (
+    <>
+      <HelperCard variant="warn">
+        <Text size="headingTwo">
+          Warning: this page is for advanced users only. Invalid transaction
+          data may cause this page to freeze. Documentation will be coming soon.
+        </Text>
+      </HelperCard>
+      <HelperCard variant="muted">
+        <Box
+        // tw="prose prose-sm prose-light"
+        >
+          <p>
+            This page allows proposing any arbitrary transaction for execution
+            by the DAO. The fee payer and recent blockhash will not be used.
+          </p>
+        </Box>
+      </HelperCard>
+      <Textarea
+        label="Transaction (base64)"
+        id="instructionsRaw"
+        rows={4}
+        placeholder="Paste raw base64 encoded transaction message"
+        value={txRaw}
+        onChange={e => {
+          setTxRaw(e.target.value);
+          try {
+            const buffer = Buffer.from(e.target.value, 'base64');
+            const tx = Transaction.from(buffer);
+            if (tx.instructions.length === 0) {
+              throw new Error('no instruction data');
+            }
+            setError(null);
+          } catch (err) {
+            setError(
+              `Invalid transaction data: ${
+                extractErrorMessage(err) ?? '(unknown)'
+              }`
+            );
+          }
+        }}
+      />
+    </>
+  );
+};
diff --git a/actions/types.tsx b/actions/types.tsx
new file mode 100644
index 00000000..461d13fe
--- /dev/null
+++ b/actions/types.tsx
@@ -0,0 +1,65 @@
+import type { PublicKey } from '@solana/web3.js';
+// import type { GovernorConfig } from '@tribecahq/registry';
+
+import { Memo } from './Memo';
+import { RawTX } from './RawTX';
+
+export interface ActorContext {
+  /**
+   * Governor.
+   */
+  governor?: PublicKey;
+  /**
+   * The veLocker.
+   */
+  locker?: PublicKey;
+  /**
+   * Settings for minting tokens as the DAO. Enabling this allows DAO members to create "mint" proposals which can be used for grants.
+   */
+  // minter?: GovernorConfig['minter'];
+}
+
+export interface ActionFormProps {
+  actor: PublicKey;
+  payer: PublicKey;
+  ctx?: ActorContext | null;
+  setError: (err: string | null) => void;
+  txRaw: string;
+  setTxRaw: (txRaw: string) => void;
+}
+
+export interface Action {
+  title: string;
+  description?: string;
+  isEnabled?: (ctx: ActorContext) => boolean;
+  Renderer: React.FC<ActionFormProps>;
+}
+
+export const ACTION_TYPES = [
+  'Memo',
+  'Issue Tokens',
+  'Upgrade Program',
+  'Whitelist Program-Managed Vote Escrow',
+  'Raw Transaction (base64)'
+] as const;
+
+export type ActionType = typeof ACTION_TYPES[number];
+
+export const ACTIONS: Action[] = [
+  {
+    title: 'Memo',
+    description:
+      "A memo allows a DAO to attest a message on chain. Memo actions may be used to create proposals that don't have any on-chain actions.",
+    Renderer: Memo
+  },
+  // {
+  //   title: "Issue Revocable Token Grant",
+  //   description: "Issue a revocable grant of tokens on behalf of the DAO.",
+  //   isEnabled: ({ minter }) => !!minter,
+  //   Renderer: VenkoGrantAction,
+  // },
+  {
+    title: 'Raw Transaction (base64)',
+    Renderer: RawTX
+  }
+];
diff --git a/components/AsyncButton.tsx b/components/AsyncButton.tsx
new file mode 100644
index 00000000..45d2a232
--- /dev/null
+++ b/components/AsyncButton.tsx
@@ -0,0 +1,39 @@
+import type { GokiSDK } from '@gokiprotocol/client';
+import { useWalletKit } from '@gokiprotocol/walletkit';
+import React from 'react';
+import { Button } from 'degen';
+import type { Props as ButtonProps } from 'degen/dist/types/components/Button';
+import { useSDK } from 'helpers/sdk';
+
+interface Props extends Omit<ButtonProps, 'onClick' | 'tone'> {
+  onClick?: (sdkMut: GokiSDK) => Promise<void> | void;
+  connectWalletOverride?: string;
+}
+
+export const AsyncButton: React.FC<Props> = ({
+  onClick,
+  children,
+  connectWalletOverride,
+  ...rest
+}: Props) => {
+  const { connect } = useWalletKit();
+  const { sdkMut } = useSDK();
+  return sdkMut !== null ? (
+    <Button
+      onClick={
+        onClick
+          ? async () => {
+              await onClick(sdkMut);
+            }
+          : undefined
+      }
+      {...rest}
+    >
+      {children}
+    </Button>
+  ) : (
+    <Button {...rest} disabled={false} onClick={() => connect()}>
+      {connectWalletOverride ?? 'Connect Wallet'}
+    </Button>
+  );
+};
diff --git a/components/HelperCard.tsx b/components/HelperCard.tsx
new file mode 100644
index 00000000..cb2d1c17
--- /dev/null
+++ b/components/HelperCard.tsx
@@ -0,0 +1,32 @@
+import { Box } from 'degen';
+
+interface Props {
+  children?: React.ReactNode;
+  className?: string;
+  variant?: 'primary' | 'muted' | 'error' | 'warn';
+}
+
+export const HelperCard: React.FC<Props> = ({
+  children,
+  variant = 'primary',
+  className
+}: Props) => {
+  let border = 'border';
+  switch (variant) {
+    case 'primary':
+    case 'muted':
+    case 'error':
+    case 'warn':
+  }
+  return (
+    <Box
+      paddingX="4"
+      paddingY="2"
+      borderWidth="1"
+      fontSize="small"
+      className={className}
+    >
+      {children}
+    </Box>
+  );
+};
diff --git a/components/LabeledInput.tsx b/components/LabeledInput.tsx
new file mode 100644
index 00000000..5a33568f
--- /dev/null
+++ b/components/LabeledInput.tsx
@@ -0,0 +1,43 @@
+import { Box, Text } from 'degen';
+import type { InputHTMLAttributes, TextareaHTMLAttributes } from 'react';
+
+type CommonProps<T> = InputHTMLAttributes<T> & TextareaHTMLAttributes<T>;
+
+interface Props<T extends HTMLElement> extends CommonProps<T> {
+  Component: React.FC<CommonProps<T>>;
+  label: string;
+  error?: string;
+  touched?: boolean;
+  footer?: React.ReactNode;
+}
+
+export const LabeledInput = <T extends HTMLElement>({
+  id,
+  label,
+  Component,
+  error,
+  touched,
+  footer,
+  ...commonProps
+}: Props<T>) => {
+  return (
+    <Box as="label" display="flex" flexDirection="column" gap="1" htmlFor={id}>
+      <Text size="small">{label}</Text>
+      <Component
+        {...commonProps}
+        id={id}
+        // css={[touched && error && tw`ring-1 ring-red-500`]}
+      />
+      {touched && error && (
+        <Text as="span" size="small" color="red">
+          {error}
+        </Text>
+      )}
+      {footer !== undefined && (
+        <Text as="span" size="small">
+          {footer}
+        </Text>
+      )}
+    </Box>
+  );
+};
diff --git a/components/Modal/ModalButton.tsx b/components/Modal/ModalButton.tsx
new file mode 100644
index 00000000..7786ee3f
--- /dev/null
+++ b/components/Modal/ModalButton.tsx
@@ -0,0 +1,45 @@
+import { useState } from "react";
+
+import { Button } from "../Button";
+import { Modal } from ".";
+
+type Props = {
+  buttonLabel: string;
+  buttonProps?: React.ComponentProps<typeof Button>;
+  children?: React.ReactNode;
+  className?: string;
+  onDismiss?: () => void;
+};
+
+export const ModalButton: React.FC<Props> = ({
+  buttonLabel,
+  buttonProps,
+  children,
+  className,
+  onDismiss,
+}: Props) => {
+  const [showModal, setShowModal] = useState<boolean>(false);
+  return (
+    <>
+      <Modal
+        tw="p-0"
+        isOpen={showModal}
+        onDismiss={() => {
+          onDismiss?.();
+          setShowModal(false);
+        }}
+        className={className}
+      >
+        {children}
+      </Modal>
+      <Button
+        {...buttonProps}
+        onClick={() => {
+          setShowModal(true);
+        }}
+      >
+        {buttonLabel}
+      </Button>
+    </>
+  );
+};
diff --git a/components/Modal/ModalInner.tsx b/components/Modal/ModalInner.tsx
new file mode 100644
index 00000000..436b7f9b
--- /dev/null
+++ b/components/Modal/ModalInner.tsx
@@ -0,0 +1,54 @@
+import { Box, Button, IconClose } from 'degen';
+import { useModal } from './context';
+
+interface Props {
+  title: string;
+  children?: React.ReactNode;
+  buttonProps?: React.ComponentProps<typeof Button>;
+  className?: string;
+}
+
+export const ModalInner: React.FC<Props> = ({
+  title,
+  children,
+  buttonProps,
+  className
+}: Props) => {
+  const { close } = useModal();
+  return (
+    <>
+      <Box
+        position="relative"
+        fontWeight="bold"
+        textAlign="center"
+        paddingY="4"
+        // tw="relative border-b dark:border-b-warmGray-800 dark:text-white font-bold text-base text-center py-4"
+      >
+        <Box
+          paddingX="8"
+          overflow="hidden"
+          whiteSpace="nowrap"
+          // tw="px-8 overflow-ellipsis overflow-hidden whitespace-nowrap"
+        >
+          {title}
+        </Box>
+        <Box position="absolute" display="flex" right="4" top="0">
+          <Button
+            onClick={() => close()}
+            // tw="absolute right-4 h-full flex items-center top-0 text-warmGray-600 hover:text-warmGray-200 transition-colors"
+          >
+            <IconClose />
+          </Button>
+        </Box>
+      </Box>
+      <Box padding="8" className={className}>
+        {children}
+        {buttonProps && (
+          <Box marginTop="8" height="10">
+            <Button width="full" {...buttonProps} />
+          </Box>
+        )}
+      </Box>
+    </>
+  );
+};
diff --git a/components/Modal/context.tsx b/components/Modal/context.tsx
new file mode 100644
index 00000000..9820ec55
--- /dev/null
+++ b/components/Modal/context.tsx
@@ -0,0 +1,16 @@
+import { noop } from "lodash";
+import { createContainer } from "unstated-next";
+
+const useModalInner = (
+  close: () => void = noop
+): {
+  close: () => void;
+} => {
+  if (!close) {
+    throw new Error("no close provided");
+  }
+  return { close };
+};
+
+export const { useContainer: useModal, Provider: ModalProvider } =
+  createContainer(useModalInner);
diff --git a/components/Modal/index.tsx b/components/Modal/index.tsx
new file mode 100644
index 00000000..50f47672
--- /dev/null
+++ b/components/Modal/index.tsx
@@ -0,0 +1,113 @@
+import '@reach/dialog/styles.css';
+
+import { css } from '@emotion/react';
+import styled from '@emotion/styled';
+import { DialogContent, DialogOverlay } from '@reach/dialog';
+import { animated, useSpring, useTransition } from '@react-spring/web';
+import React from 'react';
+import { isMobile } from 'react-device-detect';
+import { useGesture } from 'react-use-gesture';
+
+import { ModalProvider } from './context';
+
+export interface ModalProps {
+  children: React.ReactNode;
+  isOpen: boolean;
+  onDismiss: () => void;
+  darkenOverlay?: boolean;
+  className?: string;
+}
+
+export const Modal: React.FC<ModalProps> = ({
+  className,
+  children,
+  isOpen,
+  onDismiss,
+  darkenOverlay = true
+}: ModalProps) => {
+  const fadeTransition = useTransition(isOpen, {
+    config: { duration: 150 },
+    from: { opacity: 0 },
+    enter: { opacity: 1 },
+    leave: { opacity: 0 }
+  });
+
+  const [{ y }, set] = useSpring(() => ({
+    y: 0,
+    config: { mass: 1, tension: 210, friction: 20 }
+  }));
+  const bind = useGesture({
+    onDrag: state => {
+      set({
+        y: state.down ? state.movement[1] : 0
+      });
+      if (
+        state.movement[1] > 300 ||
+        (state.velocity > 3 && state.direction[1] > 0)
+      ) {
+        onDismiss();
+      }
+    }
+  });
+
+  return (
+    <>
+      {fadeTransition(
+        (transition, item) =>
+          item && (
+            <StyledDialogOverlay
+              style={transition}
+              isOpen={isOpen || transition.opacity.get() !== 0}
+              onDismiss={onDismiss}
+              darkenOverlay={darkenOverlay}
+            >
+              <ModalWrapper
+                className={className}
+                aria-label="dialog content"
+                {...(isMobile
+                  ? {
+                      ...bind(),
+                      style: {
+                        transform: y.to(n => `translateY(${n > 0 ? n : 0}px)`)
+                      }
+                    }
+                  : {})}
+              >
+                <ModalProvider initialState={onDismiss}>
+                  {children}
+                </ModalProvider>
+              </ModalWrapper>
+            </StyledDialogOverlay>
+          )
+      )}
+    </>
+  );
+};
+
+const ModalWrapper = styled(animated(DialogContent))``;
+
+// const ModalWrapper = styled(animated(DialogContent))`
+//   ${tw`shadow-2xl w-full max-w-lg p-6 rounded-lg relative`}
+//   ${tw`dark:(bg-warmGray-850)`}
+// `;
+
+const StyledDialogOverlay = styled(animated(DialogOverlay), {
+  shouldForwardProp: prop => prop !== 'darkenOverlay'
+})<{
+  darkenOverlay: boolean;
+}>`
+  &[data-reach-dialog-overlay] {
+    z-index: 11 !important;
+  }
+  [data-reach-dialog-content] {
+    padding: 0;
+  }
+  ${({ darkenOverlay }) =>
+    darkenOverlay
+      ? css`
+          background: rgba(0, 0, 0, 0.55);
+        `
+      : css`
+          background: none;
+        `}
+`;
diff --git a/components/Proposals/ProposalCreateView/index.tsx b/components/Proposals/ProposalCreateView/index.tsx
new file mode 100644
index 00000000..c22b01da
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/index.tsx
@@ -0,0 +1,5 @@
+import { ProposalCreateView as LockedVoter } from './locked-voter';
+
+export const ProposalCreateView: React.FC = () => {
+  return <LockedVoter />;
+};
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
new file mode 100644
index 00000000..da20620e
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
@@ -0,0 +1,23 @@
+import type { TransactionInstruction } from '@solana/web3.js';
+import { Box } from 'degen';
+
+import { useParsedInstruction } from 'hooks/useParsedInstruction';
+
+interface Props {
+  ix: TransactionInstruction;
+}
+
+export const ProposalIX: React.FC<Props> = ({ ix }: Props) => {
+  const parsedIX = useParsedInstruction(ix);
+  return (
+    <Box
+      opacity="50"
+      paddingX="4"
+      paddingY="2"
+      fontSize="small"
+      fontWeight="semiBold"
+    >
+      {parsedIX.title}
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
new file mode 100644
index 00000000..a676cf65
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
@@ -0,0 +1,124 @@
+import { useSail } from '@saberhq/sail';
+import { buildStubbedTransaction } from '@saberhq/solana-contrib';
+import { useSolana } from '@saberhq/use-solana';
+import type { TransactionInstruction } from '@solana/web3.js';
+import { GovernorWrapper } from '@tribecahq/tribeca-sdk';
+import ReactMarkdown from 'react-markdown';
+import invariant from 'tiny-invariant';
+
+import { useSDK } from 'helpers/sdk';
+import { useGovernor, useGovernorParams } from 'hooks/tribeca/useGovernor';
+// import { notify } from '../../../../../../../utils/notifications';
+import { HelperCard } from 'components/HelperCard';
+import type { ModalProps } from 'components/Modal';
+import { Modal } from 'components/Modal';
+import { ModalInner } from 'components/Modal/ModalInner';
+import { ProposalIX } from './ProposalIX';
+import { useRouter } from 'next/router';
+import { Box, IconLink, Text } from 'degen';
+
+type Props = Omit<ModalProps, 'children'> & {
+  proposal: {
+    title: string;
+    description: string;
+    instructions: TransactionInstruction[];
+  };
+};
+
+export const ProposalConfirmModal: React.FC<Props> = ({
+  proposal,
+  ...modalProps
+}: Props) => {
+  const { network } = useSolana();
+  const { tribecaMut } = useSDK();
+  const { governor, minActivationThreshold } = useGovernor();
+  const { votingPeriodFmt } = useGovernorParams();
+  const { handleTX } = useSail();
+  const router = useRouter();
+
+  const doProposeTransaction = async () => {
+    invariant(tribecaMut);
+    const gov = new GovernorWrapper(tribecaMut, governor!);
+    const createProposal = await gov.createProposal({
+      instructions: proposal.instructions
+    });
+    const createProposalMetaTX = await gov.createProposalMeta({
+      proposal: createProposal.proposal,
+      title: proposal.title,
+      descriptionLink: proposal.description
+    });
+    for (const txEnv of [createProposal.tx, createProposalMetaTX]) {
+      const { pending, success } = await handleTX(txEnv, 'Create Proposal');
+      if (!success || !pending) {
+        return;
+      }
+      await pending.wait();
+    }
+    // notify({
+    //   message: `Proposal ${`000${createProposal.index.toString()}`.slice(
+    //     -4
+    //   )} created`
+    // });
+    router.push(`proposals/${createProposal.index.toString()}`);
+    modalProps.onDismiss();
+  };
+
+  return (
+    <Modal
+      // tw="p-0 dark:text-white"
+      {...modalProps}
+    >
+      <ModalInner
+        title={`Proposal: ${proposal.title}`}
+        buttonProps={{
+          disabled: !tribecaMut,
+          variant: 'primary',
+          onClick: doProposeTransaction,
+          children: 'Propose Transaction'
+        }}
+      >
+        <Box display="grid" paddingY="4" gap="4">
+          <HelperCard>
+            <Box as="p" marginBottom="1">
+              Tip: The proposal cannot be modified after submission, so please
+              verify all information before submitting.
+            </Box>
+            <Text as="p">
+              Once submitted, anyone with at least{' '}
+              {minActivationThreshold?.formatUnits()} may start the voting
+              period, i.e., activate the proposal. The voting period will then
+              immediately begin and last for {votingPeriodFmt}.
+            </Text>
+          </HelperCard>
+          <Text>
+            <div>
+              <ReactMarkdown>{proposal.description}</ReactMarkdown>
+            </div>
+          </Text>
+          <Box display="flex" flexDirection="column" gap="1.5">
+            {proposal.instructions.map((ix, i) => (
+              <ProposalIX key={i} ix={ix} />
+            ))}
+          </Box>
+          {network !== 'localnet' && proposal.instructions.length > 0 && (
+            <a
+              // tw="text-sm text-primary hover:text-white transition-colors flex items-center gap-2"
+              href={`https://${
+                network === 'mainnet-beta' ? '' : `${network}.`
+              }anchor.so/tx/inspector?message=${encodeURIComponent(
+                buildStubbedTransaction(network, proposal.instructions)
+                  .serializeMessage()
+                  .toString('base64')
+              )}`}
+              target="_blank"
+              rel="noreferrer"
+            >
+              <span>Preview on Anchor.so</span>
+              <IconLink />
+            </a>
+          )}
+        </Box>
+      </ModalInner>
+    </Modal>
+  );
+};
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
new file mode 100644
index 00000000..83fde3f0
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -0,0 +1,246 @@
+import { useMemo, useState } from 'react';
+import {
+  extractErrorMessage,
+  useAccountData,
+  useTXHandlers
+} from '@saberhq/sail';
+import { LAMPORTS_PER_SOL, SystemProgram, Transaction } from '@solana/web3.js';
+import ReactMarkdown from 'react-markdown';
+
+import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+// import { AsyncButton } from '../../../../../common/AsyncButton';
+// import { Button } from '../../../../../common/Button';
+// import { Card } from '../../../../../common/governance/Card';
+// import { HelperCard } from '../../../../../common/HelperCard';
+// import { InputText, Textarea } from '../../../../../common/inputs/InputText';
+// import { LabeledInput } from '../../../../../common/inputs/LabeledInput';
+import { ProposalConfirmModal } from './ProposalConfirmationModal';
+import { ProposalTXForm } from './ProposalTXForm';
+import { HelperCard } from 'components/HelperCard';
+import { Box, Button, Card, Heading, Input, Textarea, Text } from 'degen';
+import { AsyncButton } from 'components/AsyncButton';
+
+export const ProposalCreateInner: React.FC = () => {
+  const [title, setTitle] = useState<string>('');
+  const [description, setDescription] = useState<string>('');
+  const [discussionLink, setDiscussionLink] = useState<string>('');
+  const [txRaw, setTxRaw] = useState<string>('');
+  const [theError, setError] = useState<string | null>(null);
+  const { minActivationThreshold, manifest } = useGovernor();
+  const { signAndConfirmTX } = useTXHandlers();
+
+  const proposalCfg = manifest?.proposals;
+  const discussionRequired = !!proposalCfg?.discussion?.required;
+
+  const { tx, error: parseError } = useMemo(() => {
+    try {
+      const buffer = Buffer.from(txRaw, 'base64');
+      const tx = Transaction.from(buffer);
+      if (tx.instructions.length === 0) {
+        return { error: 'Transaction cannot be empty' };
+      }
+      return { tx };
+    } catch (e) {
+      return {
+        error: extractErrorMessage(e)
+      };
+    }
+  }, [txRaw]);
+
+  const error =
+    discussionRequired && !discussionLink
+      ? 'Discussion link is required'
+      : proposalCfg?.discussion?.prefix &&
+        !discussionLink.startsWith(proposalCfg.discussion.prefix)
+      ? 'Invalid discussion link'
+      : theError ?? parseError;
+
+  const [showConfirm, setShowConfirm] = useState<boolean>(false);
+  const { ownerInvokerKey } = useExecutiveCouncil();
+
+  // check to see if the payer is involved
+  // if so, we should be showing the funding button
+  const payerMut =
+    !!ownerInvokerKey &&
+    !!tx?.instructions
+      .flatMap(ix => ix.keys)
+      .find(
+        meta =>
+          meta.pubkey.equals(ownerInvokerKey) &&
+          meta.isWritable &&
+          meta.isSigner
+      )
+      ? ownerInvokerKey
+      : null;
+
+  const { data: payerMutData } = useAccountData(payerMut);
+  const currentPayerBalance =
+    payerMutData === undefined
+      ? undefined
+      : (payerMutData?.accountInfo.lamports ?? 0) / LAMPORTS_PER_SOL;
+
+  return (
+    <>
+      <ProposalConfirmModal
+        isOpen={showConfirm}
+        onDismiss={() => {
+          setShowConfirm(false);
+        }}
+        proposal={{
+          title,
+          description: discussionLink
+            ? `${description}\n\n[View Discussion](${discussionLink})`
+            : description,
+          instructions: tx?.instructions ?? []
+        }}
+      />
+      <Box
+        display="flex"
+        flexDirection="column"
+        gap="8"
+        // tw="flex flex-col gap-8 md:grid"
+        // css={css`
+        //   grid-template-columns: 400px 1fr;
+        // `}
+      >
+        <div>
+          <Card>
+            <Box display="grid" gap="4" paddingX="7" paddingY="6">
+              {/* <HelperCard variant="muted"> */}
+              <Box>
+                <Box as="p" color="white" marginBottom="2">
+                  You are creating a proposal draft.
+                </Box>
+                <Text as="p">
+                  If activated by a a DAO member with at least{' '}
+                  <strong>{minActivationThreshold?.formatUnits()}</strong>, the
+                  members of the DAO may vote to execute or reject the proposal.
+                </Text>
+              </Box>
+              {/* </HelperCard> */}
+              {proposalCfg?.notice && (
+                <HelperCard variant="primary">
+                  <div
+                  // css={css`
+                  //   p {
+                  //     ${tw`mb-2`}
+                  //   }
+                  //   a {
+                  //     ${tw`text-white`}
+                  //     &:hover {
+                  //       ${tw`underline`}
+                  //     }
+                  //   }
+                  // `}
+                  >
+                    <ReactMarkdown>{proposalCfg.notice}</ReactMarkdown>
+                  </div>
+                </HelperCard>
+              )}
+              {/* <label tw="flex flex-col gap-1" htmlFor="title">
+                <span tw="text-sm">Title (max 140 characters)</span> */}
+              <Input
+                label="Title (max 140 characters)"
+                id="title"
+                placeholder="A short summary of your proposal."
+                value={title}
+                maxLength={140}
+                onChange={e => setTitle(e.target.value)}
+              />
+              {/* </label> */}
+              {/* <label tw="flex flex-col gap-1" htmlFor="description"> */}
+              {/* <span tw="text-sm">Description (max 750 characters)</span> */}
+              <Textarea
+                label="Description (max 750 characters)"
+                id="description"
+                rows={4}
+                maxLength={750}
+                placeholder={`## Summary\nYour proposal will be formatted using Markdown.`}
+                value={description}
+                onChange={e => setDescription(e.target.value)}
+              />
+              {/* </label> */}
+              {proposalCfg?.discussion?.required && (
+                <Textarea
+                  // Component={InputText}
+                  id="discussionLink"
+                  required
+                  label="Link to discussion (required)"
+                  placeholder={`URL must start with "${
+                    proposalCfg?.discussion.prefix ?? ''
+                  }"`}
+                  // type="text"
+                  value={discussionLink}
+                  onChange={e => setDiscussionLink(e.target.value)}
+                  error={
+                    !discussionLink.startsWith(
+                      proposalCfg.discussion.prefix ?? ''
+                    )
+                      ? 'Invalid discussion link'
+                      : undefined
+                  }
+                  // touched={true}
+                />
+              )}
+            </Box>
+          </Card>
+        </div>
+        <Box display="flex" flexDirection="column" gap="4">
+          <Card padding="6">
+            <Heading>Proposal Action</Heading>
+            <Box display="grid" gap="4" paddingX="7" paddingY="6">
+              <ProposalTXForm
+                setError={setError}
+                txRaw={txRaw}
+                setTxRaw={setTxRaw}
+              />
+            </Box>
+          </Card>
+          <Box display="flex" gap="4">
+            {payerMut &&
+              currentPayerBalance !== undefined &&
+              currentPayerBalance < 0.5 && (
+                <AsyncButton
+                  width="full"
+                  // tw="flex-1"
+                  size="medium"
+                  onClick={async ({ provider }) => {
+                    await signAndConfirmTX(
+                      provider.newTX([
+                        SystemProgram.transfer({
+                          fromPubkey: provider.walletKey,
+                          toPubkey: payerMut,
+                          lamports: LAMPORTS_PER_SOL
+                        })
+                      ])
+                    );
+                  }}
+                >
+                  <Box display="flex" flexDirection="column">
+                    <span>Fund with 1 SOL</span>
+                    <Text as="span" size="small">
+                      (payer balance: {currentPayerBalance.toLocaleString()}{' '}
+                      SOL)
+                    </Text>
+                  </Box>
+                </AsyncButton>
+              )}
+            <Button
+              // tw="flex-1"
+              // size="md"
+              type="button"
+              disabled={!(tx && title && description) || !!error}
+              variant="primary"
+              onClick={() => {
+                setShowConfirm(true);
+              }}
+            >
+              {error ? error : 'Preview Proposal'}
+            </Button>
+          </Box>
+        </Box>
+      </Box>
+    </>
+  );
+};
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
new file mode 100644
index 00000000..93942d3f
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
@@ -0,0 +1,97 @@
+import { useState } from 'react';
+
+import type { ActionType } from 'actions/types';
+import { ACTIONS } from 'actions/types';
+import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { HelperCard } from 'components/HelperCard';
+import { Box, Field, Spinner, Text } from 'degen';
+// import { Select } from '../../../../../common/inputs/InputText';
+// import { LoadingPage } from '../../../../../common/LoadingPage';
+
+interface Props {
+  txRaw: string;
+  setError: (error: string | null) => void;
+  setTxRaw: (txRaw: string) => void;
+}
+
+export const ProposalTXForm: React.FC<Props> = ({
+  setError,
+  txRaw,
+  setTxRaw
+}: Props) => {
+  const [actionType, setActionType] = useState<ActionType>('Upgrade Program');
+  const { meta, smartWallet, lockerData, governor } = useGovernor();
+  const { ownerInvokerKey } = useExecutiveCouncil();
+
+  if (!smartWallet || !ownerInvokerKey) {
+    return <Spinner />;
+  }
+
+  const actor = smartWallet;
+  const ctx = { ...meta, locker: lockerData?.publicKey, governor };
+
+  const currentAction = ACTIONS.find(action => action.title === actionType);
+
+  return (
+    <Box display="grid" gap="4" htmlFor="proposedAction">
+      <Field label={<Text as="span">Proposed Action</Text>}>
+        <select
+          value={actionType}
+          onChange={e => {
+            setActionType(e.target.value as ActionType);
+            setError(null);
+            setTxRaw('');
+          }}
+        >
+          {ACTIONS.map(({ title, isEnabled }) => {
+            if (isEnabled && ctx && !isEnabled(ctx)) {
+              return null;
+            }
+            return (
+              <option key={title} value={title}>
+                {title}
+              </option>
+            );
+          })}
+        </select>
+      </Field>
+      {/* <label tw="flex flex-col gap-1" htmlFor="proposedAction">
+        <select
+          value={actionType}
+          onChange={e => {
+            setActionType(e.target.value as ActionType);
+            setError(null);
+            setTxRaw('');
+          }}
+        >
+          {ACTIONS.map(({ title, isEnabled }) => {
+            if (isEnabled && ctx && !isEnabled(ctx)) {
+              return null;
+            }
+            return (
+              <option key={title} value={title}>
+                {title}
+              </option>
+            );
+          })}
+        </select>
+      </label> */}
+      {currentAction && (
+        <>
+          {currentAction.description && (
+            <HelperCard>{currentAction.description}</HelperCard>
+          )}
+          <currentAction.Renderer
+            actor={actor}
+            payer={ownerInvokerKey}
+            ctx={ctx}
+            txRaw={txRaw}
+            setError={setError}
+            setTxRaw={setTxRaw}
+          />
+        </>
+      )}
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalCreateView/locked-voter/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/index.tsx
new file mode 100644
index 00000000..566ea4a1
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/locked-voter/index.tsx
@@ -0,0 +1,25 @@
+import { Card, Heading } from 'degen';
+import { useSDK } from 'helpers/sdk';
+// import { EmptyStateConnectWallet } from '../../../../../common/EmptyState';
+// import { Card } from '../../../../../common/governance/Card';
+// import { GovernancePage } from '../../../../../common/governance/GovernancePage';
+import { ProposalCreateInner } from './ProposalCreateInner';
+
+export const ProposalCreateView: React.FC = () => {
+  const { sdkMut } = useSDK();
+  return (
+    // <GovernancePage
+    //   title="Create a Proposal"
+    //   containerStyles={tw`w-11/12 md:w-full max-w-7xl mx-auto`}
+    // >
+    sdkMut ? (
+      <ProposalCreateInner />
+    ) : (
+      <Card>
+        <Heading>Proposal Info</Heading>
+        {/* <EmptyStateConnectWallet /> */}
+      </Card>
+    )
+    // </GovernancePage>
+  );
+};
diff --git a/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx b/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
new file mode 100644
index 00000000..5641a3c0
--- /dev/null
+++ b/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
@@ -0,0 +1,67 @@
+import { Box, Spinner } from 'degen';
+import BN from 'bn.js';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { formatNumberSI } from 'helpers/format';
+// import { Meter } from '../../../../../common/Meter';
+
+interface Props {
+  proposal: ProposalInfo;
+}
+
+export const ActiveProposalVotingBars: React.FC<Props> = ({
+  proposal
+}: Props) => {
+  const { veToken } = useGovernor();
+  if (!veToken) {
+    return <Spinner />;
+  }
+  const forVotes = proposal.proposalData.forVotes
+    .div(new BN(10 ** veToken.decimals))
+    .toNumber();
+  const againstVotes = proposal.proposalData.againstVotes
+    .div(new BN(10 ** veToken.decimals))
+    .toNumber();
+  const maxVotes = Math.max(forVotes, againstVotes, 1);
+  return (
+    <Box display="flex" flexDirection="column">
+      <Box
+        width="full"
+        display="flex"
+        alignItems="center"
+        height="6"
+        fontWeight="medium"
+        color="white"
+      >
+        {/* <div tw="w-full flex items-center gap-3 text-xs text-white font-medium h-6"> */}
+        {/* <Meter
+          value={forVotes}
+          max={maxVotes}
+          barColor={theme`colors.primary`}
+        /> */}
+        {/* <div tw="flex-basis[44px]"> */}
+        {formatNumberSI(forVotes)}
+        {/* </div> */}
+      </Box>
+      <Box
+        width="full"
+        display="flex"
+        alignItems="center"
+        height="6"
+        fontWeight="medium"
+        color="white"
+      >
+        {/* <div tw="w-full flex items-center gap-3 text-xs text-white font-medium h-6"> */}
+        {/* <Meter
+          value={againstVotes}
+          max={maxVotes}
+          barColor={theme`colors.red.500`}
+        /> */}
+        {/* <div tw="flex-basis[44px]"> */}
+        {formatNumberSI(againstVotes)}
+        {/* </div> */}
+      </Box>
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalsList/PageNav.tsx b/components/Proposals/ProposalsList/PageNav.tsx
new file mode 100644
index 00000000..93cc6558
--- /dev/null
+++ b/components/Proposals/ProposalsList/PageNav.tsx
@@ -0,0 +1,63 @@
+import { Box, Button, IconChevronLeft, IconChevronRight, Stack } from 'degen';
+
+interface Props {
+  numPages: number;
+  currentPage: number;
+  setCurrentPage: (page: number) => void;
+}
+
+export const PageNav: React.FC<Props> = (props: Props) => {
+  const { currentPage, setCurrentPage, numPages } = props;
+  return (
+    <>
+      <Box
+        display="flex"
+        alignItems="center"
+        justifyContent="space-between"
+        paddingX="7"
+        paddingY="3"
+      >
+        <Box width="20">
+          {currentPage !== 0 ? (
+            <Button
+              prefix={<IconChevronLeft />}
+              onClick={() => setCurrentPage(currentPage - 1)}
+              variant="transparent"
+            >
+              Prev
+            </Button>
+          ) : (
+            <div />
+          )}
+        </Box>
+        <Box aria-label="Page navigation" flexGrow={1}>
+          <Stack
+            justify="center"
+            align="center"
+            direction="horizontal"
+            //  tw="w-full justify-center flex gap-4 items-center"
+          >
+            {new Array(numPages).fill(null).map((_, i) => (
+              <li key={i}>
+                <button onClick={() => setCurrentPage(i)}>{i + 1}</button>
+              </li>
+            ))}
+          </Stack>
+        </Box>
+        <Box width="20" textAlign="right">
+          {currentPage !== numPages - 1 ? (
+            <Button
+              suffix={<IconChevronRight />}
+              variant="transparent"
+              onClick={() => setCurrentPage(currentPage + 1)}
+            >
+              Next
+            </Button>
+          ) : (
+            <div />
+          )}
+        </Box>
+      </Box>
+    </>
+  );
+};
diff --git a/components/Proposals/ProposalsList/PlaceholderCard.tsx b/components/Proposals/ProposalsList/PlaceholderCard.tsx
new file mode 100644
index 00000000..2d29223e
--- /dev/null
+++ b/components/Proposals/ProposalsList/PlaceholderCard.tsx
@@ -0,0 +1,39 @@
+import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { Box, Skeleton } from 'degen';
+import React from 'react';
+
+import { ProposalStateLabel } from './ProposalStateLabel';
+
+export const PlaceholderCard: React.FC = () => {
+  return (
+    <Box
+      display="flex"
+      alignItems="center"
+      justifyContent="space-between"
+      paddingX="6"
+      paddingY="7"
+      borderLeftWidth="2"
+      cursor="pointer"
+      borderColor="transparent"
+      borderBottomWidth="1"
+    >
+      <div>
+        <Box display="flex" alignItems="center" height="5">
+          <Skeleton loading height="3" backgroundColor="accentSecondary" />
+        </Box>
+        <PlaceholderSubtitle />
+      </div>
+    </Box>
+  );
+};
+
+export const PlaceholderSubtitle: React.FC = () => (
+  <Box display="flex" alignItems="center" marginTop="2" gap="2">
+    <ProposalStateLabel state={ProposalState.Draft} />
+    <Box display="flex" alignItems="center" gap="1">
+      <Skeleton loading height="2" width="4" />
+      <span>&middot;</span>
+      <Skeleton loading height="2" width="20" />
+    </Box>
+  </Box>
+);
diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
new file mode 100644
index 00000000..c717b353
--- /dev/null
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -0,0 +1,86 @@
+import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { Box, Text } from 'degen';
+import Link from 'next/link';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { PROPOSAL_TITLE_MAX_LEN } from 'helpers/sdk/constant';
+import { ActiveProposalVotingBars } from './ActiveProposalVotingBars';
+import { ProposalStateBadge } from './ProposalStateBadge';
+import { ProposalStateDate } from './ProposalStateDate';
+import { ProposalStateLabel } from './ProposalStateLabel';
+import { PulsingDot } from 'icons/PulsingDot';
+
+interface Props {
+  proposalInfo: ProposalInfo;
+}
+
+export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
+  const { path } = useGovernor();
+  const { state, executed } = proposalInfo.status;
+  return (
+    <Link
+      href={`${path}/proposals/${proposalInfo.index}`}
+      passHref
+      // tw="flex items-center justify-between py-5 px-6 border-l-2 border-l-transparent border-b border-b-warmGray-800 cursor-pointer hover:border-l-primary"
+    >
+      <Box
+        display="flex"
+        alignItems="center"
+        gap="5"
+        width={{ md: '192', xs: '3/4' }}
+        // tw="flex items-center gap-5 w-3/4 md:w-[500px]"
+      >
+        {state === ProposalState.Active && <PulsingDot color="decendent" />}
+        <div>
+          <Box display="flex" alignItems="center">
+            <Text
+              color="white"
+              lineHeight="1.375"
+              // tw="text-white leading-snug break-words hyphens[auto]"
+            >
+              {proposalInfo.proposalMetaData?.title.slice(
+                0,
+                PROPOSAL_TITLE_MAX_LEN
+              )}
+            </Text>
+          </Box>
+          {proposalInfo.proposalData && state !== null && (
+            <Box
+              display="flex"
+              flexDirection={{ md: 'row', xs: 'column' }}
+              alignItems={{ md: 'center' }}
+              marginTop={{ md: '4', xs: '2' }}
+              gap="2"
+              // tw="flex flex-col mt-4 gap-2 md:(flex-row items-center mt-2)"
+            >
+              <ProposalStateLabel state={state} executed={executed} />
+              <Box
+                display="flex"
+                gap="1"
+                fontSize="small"
+                fontWeight="semiBold"
+              >
+                <span>{`000${proposalInfo.index}`.slice(-4)}</span>
+                <span>&middot;</span>
+                <ProposalStateDate proposalInfo={proposalInfo} />
+              </Box>
+            </Box>
+          )}
+        </div>
+      </Box>
+      {state === ProposalState.Active && (
+        <Box width="192">
+          <ActiveProposalVotingBars proposal={proposalInfo} />
+        </Box>
+      )}
+      {state !== null &&
+        state !== ProposalState.Draft &&
+        state !== ProposalState.Active && (
+          <Box width={{ sm: '16', md: '20', lg: '40' }}>
+            <ProposalStateBadge status={proposalInfo.status} />
+          </Box>
+        )}
+    </Link>
+  );
+};
diff --git a/components/Proposals/ProposalsList/ProposalStateBadge.tsx b/components/Proposals/ProposalsList/ProposalStateBadge.tsx
new file mode 100644
index 00000000..caef46c2
--- /dev/null
+++ b/components/Proposals/ProposalsList/ProposalStateBadge.tsx
@@ -0,0 +1,59 @@
+import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { startCase } from 'lodash';
+import { IconCheck, IconPencil, IconClose, IconRefresh } from 'degen';
+import type { ProposalStatus } from 'hooks/tribeca/useProposals';
+
+interface Props {
+  status: ProposalStatus;
+}
+
+const STATE_LABELS: { [K in ProposalState]: string } = {
+  [ProposalState.Active]: 'active',
+  [ProposalState.Draft]: 'draft',
+  [ProposalState.Canceled]: 'canceled',
+  [ProposalState.Defeated]: 'failed',
+  [ProposalState.Succeeded]: 'passed',
+  [ProposalState.Queued]: 'queued'
+};
+
+const getStateIcon = (state: ProposalState): React.ReactNode => {
+  switch (state) {
+    case ProposalState.Active:
+      return (
+        <div tw="bg-accent text-white h-6 w-6 rounded-full flex items-center justify-center">
+          <IconRefresh />
+        </div>
+      );
+    case ProposalState.Canceled:
+    case ProposalState.Defeated:
+      return (
+        <div tw="bg-gray-500 text-white h-6 w-6 rounded-full flex items-center justify-center">
+          <IconClose />
+        </div>
+      );
+    case ProposalState.Draft:
+      return (
+        <div tw="bg-gray-500 text-white h-6 w-6 rounded-full flex items-center justify-center">
+          <IconPencil />
+        </div>
+      );
+    default:
+      return (
+        <div tw="bg-primary text-white h-6 w-6 rounded-full flex items-center justify-center">
+          <IconCheck />
+        </div>
+      );
+  }
+};
+
+export const ProposalStateBadge: React.FC<Props> = ({ status }: Props) => {
+  const { executed, state } = status;
+  return (
+    <div tw="flex flex-col items-center gap-1 lg:(flex-row gap-5)">
+      {getStateIcon(state)}
+      <span tw="text-xs md:text-sm text-white">
+        {startCase(executed ? 'executed' : STATE_LABELS[state])}
+      </span>
+    </div>
+  );
+};
diff --git a/components/Proposals/ProposalsList/ProposalStateDate.tsx b/components/Proposals/ProposalsList/ProposalStateDate.tsx
new file mode 100644
index 00000000..bcc26ed5
--- /dev/null
+++ b/components/Proposals/ProposalsList/ProposalStateDate.tsx
@@ -0,0 +1,72 @@
+import type { ProposalData } from "@tribecahq/tribeca-sdk";
+import { ProposalState } from "@tribecahq/tribeca-sdk";
+import type BN from "bn.js";
+import Countdown from "react-countdown";
+
+import type {
+  ProposalInfo,
+  ProposalStatus,
+} from "../../../../../../hooks/tribeca/useProposals";
+
+interface Props {
+  proposalInfo: ProposalInfo;
+}
+
+const STATE_LABELS: { [K in ProposalState]: string } = {
+  [ProposalState.Active]: "Voting ends",
+  [ProposalState.Draft]: "Created",
+  [ProposalState.Canceled]: "Canceled",
+  [ProposalState.Defeated]: "Failed",
+  [ProposalState.Succeeded]: "Passed",
+  [ProposalState.Queued]: "Queued",
+};
+
+export const stateToDateSeconds = (
+  proposal: ProposalData,
+  status: ProposalStatus
+): BN | null => {
+  if (status.executed) {
+    return status.executionTime;
+  }
+
+  switch (status.state) {
+    case ProposalState.Active:
+      return proposal.votingEndsAt;
+    case ProposalState.Canceled:
+      return null;
+    case ProposalState.Defeated:
+    case ProposalState.Succeeded:
+      return proposal.votingEndsAt;
+    case ProposalState.Draft:
+      return proposal.createdAt;
+    case ProposalState.Queued:
+      return proposal.queuedAt;
+  }
+};
+
+export const ProposalStateDate: React.FC<Props> = ({ proposalInfo }: Props) => {
+  const { status, proposalData } = proposalInfo;
+  const { executed, state } = status;
+  const dateSeconds = stateToDateSeconds(proposalData, status);
+  const date = dateSeconds ? new Date(dateSeconds.toNumber() * 1_000) : null;
+  return (
+    <span>
+      {executed ? "Executed" : STATE_LABELS[state]}{" "}
+      {state === ProposalState.Active ? (
+        date ? (
+          <>
+            in <Countdown date={date} />
+          </>
+        ) : (
+          "--"
+        )
+      ) : (
+        date?.toLocaleDateString(undefined, {
+          month: "long",
+          day: "numeric",
+          year: "numeric",
+        })
+      )}
+    </span>
+  );
+};
diff --git a/components/Proposals/ProposalsList/ProposalStateLabel.tsx b/components/Proposals/ProposalsList/ProposalStateLabel.tsx
new file mode 100644
index 00000000..6be607f9
--- /dev/null
+++ b/components/Proposals/ProposalsList/ProposalStateLabel.tsx
@@ -0,0 +1,43 @@
+import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { Text } from 'degen';
+import { startCase } from 'lodash';
+
+interface Props {
+  state: ProposalState;
+  executed?: boolean;
+}
+
+const STATE_LABELS: { [K in ProposalState]: string } = {
+  [ProposalState.Active]: 'active',
+  [ProposalState.Draft]: 'draft',
+  [ProposalState.Canceled]: 'canceled',
+  [ProposalState.Defeated]: 'failed',
+  [ProposalState.Succeeded]: 'passed',
+  [ProposalState.Queued]: 'queued'
+};
+
+export const ProposalStateLabel: React.FC<Props> = ({
+  state,
+  executed
+}: Props) => {
+  return (
+    <Text
+      size="small"
+      align="center"
+      // css={[
+      //   tw`text-xs border rounded py-0.5 w-16 flex items-center justify-center`,
+      //   (state === ProposalState.Canceled ||
+      //     state === ProposalState.Defeated ||
+      //     state === ProposalState.Draft) &&
+      //     tw`border-gray-500 text-gray-500`,
+      //   (executed ||
+      //     state === ProposalState.Succeeded ||
+      //     state === ProposalState.Queued) &&
+      //     tw`border-primary text-primary`,
+      //   state === ProposalState.Active && tw`border-accent text-accent`
+      // ]}
+    >
+      {startCase(executed ? 'executed' : STATE_LABELS[state])}
+    </Text>
+  );
+};
diff --git a/components/Proposals/ProposalsList/ProposalSubtitle.tsx b/components/Proposals/ProposalsList/ProposalSubtitle.tsx
new file mode 100644
index 00000000..384c548e
--- /dev/null
+++ b/components/Proposals/ProposalsList/ProposalSubtitle.tsx
@@ -0,0 +1,32 @@
+import { Box } from 'degen';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { ProposalStateDate } from './ProposalStateDate';
+import { ProposalStateLabel } from './ProposalStateLabel';
+
+interface Props {
+  className?: string;
+  proposalInfo: ProposalInfo;
+}
+
+export const ProposalSubtitle: React.FC<Props> = ({
+  proposalInfo,
+  className
+}: Props) => {
+  const { state, executed } = proposalInfo.status;
+  return (
+    <Box
+      display="flex"
+      alignItems="center"
+      gap="2"
+      marginTop="2"
+      className={className}
+    >
+      <ProposalStateLabel state={state} executed={executed} />
+      <Box display="flex" gap="1" fontSize="small" fontWeight="semiBold">
+        <span>{`000${proposalInfo.index}`.slice(-4)}</span>
+        <span>&middot;</span>
+        <ProposalStateDate proposalInfo={proposalInfo} />
+      </Box>
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalsList/index.tsx b/components/Proposals/ProposalsList/index.tsx
new file mode 100644
index 00000000..cb31f7c0
--- /dev/null
+++ b/components/Proposals/ProposalsList/index.tsx
@@ -0,0 +1,142 @@
+import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { useState } from 'react';
+import Link from 'next/link';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { useProposals } from 'hooks/tribeca/useProposals';
+import { PageNav } from './PageNav';
+import { PlaceholderCard } from './PlaceholderCard';
+import { ProposalCard } from './ProposalCard';
+import { Box, Text } from 'degen';
+
+const NUM_PLACEHOLDERS = 0;
+const PROPOSALS_PER_PAGE = 20;
+
+interface EmptyStateProps {
+  icon?: React.ReactNode;
+  title: string;
+  children?: React.ReactNode;
+  className?: string;
+}
+
+const EmptyState: React.FC<EmptyStateProps> = ({
+  icon,
+  title,
+  children,
+  className
+}) => {
+  return (
+    <Box
+      width="full"
+      paddingY="12"
+      display="flex"
+      flexDirection="column"
+      alignItems="center"
+      // tw="w-full py-12 text-sm flex flex-col items-center"
+      className={className}
+    >
+      {icon && (
+        <div
+        // tw="w-20 h-20 mb-3"
+        // css={css`
+        //   & > svg,
+        //   & > img {
+        //     ${tw`w-full h-full text-gray-300`}
+        //   }
+        // `}
+        >
+          {icon}
+        </div>
+      )}
+      <div className="h-6">
+        <Text>{title}</Text>
+      </div>
+      <div>{children}</div>
+    </Box>
+  );
+};
+
+interface Props {
+  maxCount?: number;
+  showDrafts?: boolean;
+}
+
+export const ProposalsList: React.FC<Props> = ({
+  maxCount = 9_999_999,
+  showDrafts = false
+}: Props) => {
+  const { proposalCount } = useGovernor();
+  const proposals = useProposals();
+  const [currentPage, setCurrentPage] = useState(0);
+
+  const allProposals = [
+    ...proposals,
+    ...new Array<null>(NUM_PLACEHOLDERS).fill(null)
+  ]
+    .filter(p => {
+      const proposalState = p?.data?.status.state;
+      return showDrafts
+        ? true
+        : proposalState !== ProposalState.Draft &&
+            proposalState !== ProposalState.Canceled;
+    })
+    .slice(0, maxCount);
+
+  const startCursor = currentPage * PROPOSALS_PER_PAGE;
+
+  if (typeof proposalCount !== 'number') {
+    return (
+      <>
+        {Array(Math.min(PROPOSALS_PER_PAGE, maxCount))
+          .fill(null)
+          .map((_, i) => (
+            <PlaceholderCard key={i} />
+          ))}
+      </>
+    );
+  }
+
+  if (proposalCount === 0 || allProposals.length === 0) {
+    return (
+      <div>
+        <EmptyState title="There aren't any proposals yet.">
+          <Text>
+            <Link href={`proposals/create`} passHref>
+              Create a proposal
+            </Link>
+          </Text>
+        </EmptyState>
+      </div>
+    );
+  }
+
+  const pageCount = calcPageTotal(allProposals.length ?? 0);
+  return (
+    <>
+      {allProposals
+        .slice(startCursor, startCursor + PROPOSALS_PER_PAGE)
+        .map((proposal, i) =>
+          proposal && proposal.data ? (
+            <ProposalCard
+              key={proposal.data.proposalKey.toString()}
+              proposalInfo={proposal.data}
+            />
+          ) : (
+            <PlaceholderCard key={i} />
+          )
+        )}
+      {pageCount > 1 && (
+        <PageNav
+          currentPage={currentPage}
+          setCurrentPage={setCurrentPage}
+          numPages={pageCount}
+        />
+      )}
+    </>
+  );
+};
+
+const calcPageTotal = (numProposals: number): number => {
+  const div = Math.floor(numProposals / PROPOSALS_PER_PAGE);
+  return div + (numProposals % PROPOSALS_PER_PAGE ? 1 : 0);
+};
diff --git a/helpers/constants.ts b/helpers/constants.ts
new file mode 100644
index 00000000..532a64b9
--- /dev/null
+++ b/helpers/constants.ts
@@ -0,0 +1,9 @@
+import { PublicKey } from '@solana/web3.js';
+
+export const TX_REFETCH_TIME = 1_000;
+
+export const MEMO_PROGRAM_ID = new PublicKey(
+  'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr'
+);
+
+export const PROPOSAL_TITLE_MAX_LEN = 140;
diff --git a/helpers/currencies.ts b/helpers/currencies.ts
new file mode 100644
index 00000000..ed8185f3
--- /dev/null
+++ b/helpers/currencies.ts
@@ -0,0 +1,105 @@
+import type { Token } from '@saberhq/token-utils';
+import { mapValues } from 'lodash';
+
+/**
+ * A market
+ */
+export enum CurrencyMarket {
+  USD = 'USD',
+  BTC = 'BTC',
+  LUNA = 'LUNA',
+  FTT = 'FTT',
+  SRM = 'SRM',
+  SOL = 'SOL'
+}
+
+export const getMarketTag = (market: CurrencyMarket): string =>
+  `saber-market-${market.toString().toLocaleLowerCase()}`;
+
+export const CURRENCY_MARKET_TAGS: { [C in CurrencyMarket]: string } =
+  mapValues(CurrencyMarket, value => getMarketTag(value));
+
+export const getMarketFromTag = (tag: string): CurrencyMarket | null => {
+  return (
+    (Object.entries(CURRENCY_MARKET_TAGS).find(
+      ([_, v]) => v === tag
+    )?.[0] as CurrencyMarket) ?? null
+  );
+};
+
+export const getMarket = (token: Token): CurrencyMarket => {
+  const marketTag = token.info.tags?.find(tag =>
+    tag.startsWith('saber-market-')
+  );
+  if (!marketTag) {
+    return CurrencyMarket.USD;
+  }
+  return getMarketFromTag(marketTag) ?? CurrencyMarket.USD;
+};
+
+export const getMarketIfExists = (token: Token): CurrencyMarket | null => {
+  const marketTag = token.info.tags?.find(tag =>
+    tag.startsWith('saber-market-')
+  );
+  if (!marketTag) {
+    return null;
+  }
+  return getMarketFromTag(marketTag) ?? null;
+};
+
+/**
+ * Default options for formatting the currency in large amounts.
+ */
+export const CURRENCY_INFO: {
+  [C in CurrencyMarket]: {
+    name: string;
+    symbol: string;
+    prefix?: string;
+    largeFormat: Intl.NumberFormat;
+  };
+} = {
+  USD: {
+    name: 'Stablecoin',
+    symbol: 'USD',
+    prefix: '%',
+    largeFormat: new Intl.NumberFormat(undefined, {
+      maximumFractionDigits: 0
+    })
+  },
+  BTC: {
+    name: 'Bitcoin',
+    symbol: 'BTC',
+    prefix: '₿',
+    largeFormat: new Intl.NumberFormat(undefined, {
+      maximumFractionDigits: 8
+    })
+  },
+  LUNA: {
+    name: 'Luna',
+    symbol: 'LUNA',
+    largeFormat: new Intl.NumberFormat(undefined, {
+      maximumFractionDigits: 2
+    })
+  },
+  FTT: {
+    name: 'FTT',
+    symbol: 'FTT',
+    largeFormat: new Intl.NumberFormat(undefined, {
+      maximumFractionDigits: 4
+    })
+  },
+  SRM: {
+    name: 'SRM',
+    symbol: 'SRM',
+    largeFormat: new Intl.NumberFormat(undefined, {
+      maximumFractionDigits: 3
+    })
+  },
+  SOL: {
+    name: 'SOL',
+    symbol: 'SOL',
+    largeFormat: new Intl.NumberFormat(undefined, {
+      maximumFractionDigits: 3
+    })
+  }
+};
diff --git a/helpers/fetchers.ts b/helpers/fetchers.ts
new file mode 100644
index 00000000..5b9c3b9d
--- /dev/null
+++ b/helpers/fetchers.ts
@@ -0,0 +1,28 @@
+import type { Idl } from '@project-serum/anchor';
+import { Program } from '@project-serum/anchor';
+import { makeAnchorProvider } from '@saberhq/anchor-contrib';
+import { fetchNullableWithSessionCache } from '@saberhq/sail';
+import { SignerWallet, SolanaProvider } from '@saberhq/solana-contrib';
+import type { Connection } from '@solana/web3.js';
+import { Keypair, PublicKey } from '@solana/web3.js';
+
+export const fetchIDL = async (
+  connection: Connection,
+  address: string
+): Promise<Idl | null> => {
+  const response = await fetchNullableWithSessionCache<Idl>(
+    `https://raw.githubusercontent.com/DeployDAO/solana-program-index/master/idls/${address}.json`
+  );
+  if (response === null) {
+    return await Program.fetchIdl(
+      new PublicKey(address),
+      makeAnchorProvider(
+        SolanaProvider.init({
+          connection,
+          wallet: new SignerWallet(Keypair.generate())
+        })
+      )
+    );
+  }
+  return response;
+};
diff --git a/helpers/format.ts b/helpers/format.ts
new file mode 100644
index 00000000..a9433a03
--- /dev/null
+++ b/helpers/format.ts
@@ -0,0 +1,249 @@
+import { Fraction, Percent, ZERO } from "@saberhq/token-utils";
+import formatDuration from "date-fns/formatDuration";
+import intervalToDuration from "date-fns/intervalToDuration";
+import JSBI from "jsbi";
+
+import { CURRENCY_INFO, CurrencyMarket } from "./currencies";
+
+export const DATE_FORMATTER = new Intl.DateTimeFormat(undefined, {
+  month: "short",
+  day: "numeric",
+  year: "numeric",
+  hour: "numeric",
+  minute: "numeric",
+  second: "numeric",
+  timeZoneName: "short",
+});
+
+export const FORMAT_PERCENT: Intl.NumberFormatOptions = {
+  minimumFractionDigits: 2,
+  maximumFractionDigits: 5,
+  style: "percent",
+};
+
+export const FORMAT_VOTE_PERCENT = new Intl.NumberFormat(undefined, {
+  maximumFractionDigits: 2,
+  style: "percent",
+});
+
+export const fractionToFloat = (frac: Fraction): number => {
+  if (JSBI.equal(frac.denominator, ZERO)) {
+    return JSBI.greaterThan(frac.numerator, ZERO)
+      ? Number.POSITIVE_INFINITY
+      : JSBI.lessThan(frac.numerator, ZERO)
+      ? Number.NEGATIVE_INFINITY
+      : Number.NaN;
+  }
+  return parseFloat(frac.toFixed(10));
+};
+
+const ONE_BP = new Percent(1, 10_000);
+
+export const formatPercent = (percent: Percent): string => {
+  return percent.lessThan(ONE_BP)
+    ? `${percent.toSignificant()}%`
+    : fractionToFloat(percent.asFraction).toLocaleString(
+        undefined,
+        FORMAT_PERCENT
+      );
+};
+
+export const formatPrecise = (percent: Percent): string => {
+  return (fractionToFloat(percent.asFraction) * 100).toLocaleString(undefined, {
+    maximumFractionDigits: 10,
+  });
+};
+
+export const FORMAT_DOLLARS: Intl.NumberFormatOptions = {
+  currency: "USD",
+  style: "currency",
+};
+
+export const FORMAT_DOLLARS_WHOLE: Intl.NumberFormatOptions = {
+  currency: "USD",
+  style: "currency",
+  minimumFractionDigits: 0,
+  maximumFractionDigits: 0,
+};
+
+export const formatCurrency = (
+  amount: number,
+  currency: CurrencyMarket,
+  numberFormatOptions: Intl.NumberFormatOptions = {}
+): string => {
+  if (currency === CurrencyMarket.USD) {
+    return amount.toLocaleString(undefined, {
+      ...FORMAT_DOLLARS,
+      ...numberFormatOptions,
+    });
+  }
+  const fmt = amount.toLocaleString(undefined, {
+    minimumSignificantDigits: 4,
+    ...numberFormatOptions,
+  });
+  const info = CURRENCY_INFO[currency];
+  const prefix = info.prefix;
+  if (prefix) {
+    return `${prefix}${fmt}`;
+  }
+  return `${fmt} ${info.symbol}`;
+};
+
+export const formatCurrencyWhole = (
+  amount: number,
+  currency: CurrencyMarket,
+  numberFormatOptions: Intl.NumberFormatOptions = {}
+): string => {
+  if (currency === CurrencyMarket.USD) {
+    return amount.toLocaleString(undefined, {
+      ...FORMAT_DOLLARS_WHOLE,
+      ...numberFormatOptions,
+    });
+  }
+  const fmt = amount.toLocaleString(undefined, {
+    minimumFractionDigits: 0,
+    maximumFractionDigits: 0,
+    ...numberFormatOptions,
+  });
+  const info = CURRENCY_INFO[currency];
+  const prefix = info.prefix;
+  if (prefix) {
+    return `${prefix}${fmt}`;
+  }
+  return `${fmt} ${info.symbol}`;
+};
+
+export const formatCurrencySmart = (
+  amount: number | Fraction,
+  currency: CurrencyMarket,
+  numberFormatOptions?: Intl.NumberFormatOptions
+): string => {
+  const amtFloat =
+    amount instanceof Fraction ||
+    (typeof amount === "object" && (amount as Record<string, unknown>)?.toFixed)
+      ? fractionToFloat(amount)
+      : amount;
+  const threshold =
+    currency === CurrencyMarket.USD
+      ? 100
+      : currency === CurrencyMarket.BTC
+      ? 100
+      : 1;
+  return amtFloat > threshold
+    ? formatCurrencyWhole(amtFloat, currency, numberFormatOptions)
+    : formatCurrency(amtFloat, currency, numberFormatOptions);
+};
+
+/**
+ * @warning For end-user display purposes only. It loses precision and does rounding
+ *
+ * There is padding
+ *
+ * If (Whole number digits > softMaximumSignificantDigits)
+ *   Rounds to whole number towards 0
+ * Otherwise
+ *   Defaults to token.decimals, but respects numberFormatOptions as an override
+ *
+ * Example for softMaximumSignificantDigits = 7 and token with 6 maxDigits
+ *
+ * 1234.87654321 => 1234.876 (7 significant figures)
+ * 1234567.87654321 => 1234567 (rounded down)
+ * 123456789.321 => 123456789
+ * 1.87654321 => 1.876543
+ */
+export const formatDisplayWithSoftLimit = (
+  float: number,
+  maxDecimals: number,
+  softMaximumSignificantDigits = 7,
+  numberFormatOptions?: Intl.NumberFormatOptions,
+  locale?: string
+): string => {
+  if (
+    Number.isNaN(softMaximumSignificantDigits) ||
+    softMaximumSignificantDigits <= 0
+  ) {
+    throw new Error("softMaximumSignificantDigits must be greater than 0");
+  }
+
+  // Round to integer if there are enough whole digits
+  const dropDecimalsAfter = Math.pow(10, softMaximumSignificantDigits - 1);
+
+  if (float >= dropDecimalsAfter) {
+    // Round down to display integer amount
+    const wholeNumberFormatOptions: Intl.NumberFormatOptions = Object.assign(
+      {},
+      numberFormatOptions,
+      {
+        maximumFractionDigits: 0,
+      }
+    );
+    return Math.floor(float).toLocaleString(locale, wholeNumberFormatOptions);
+  }
+
+  // Round to maxDecimals if too small
+  const sigDerivedDigitsOnRight =
+    softMaximumSignificantDigits - Math.floor(Math.log10(float)) - 1;
+
+  const digitsOnRight = Math.max(
+    0,
+    Math.min(maxDecimals, sigDerivedDigitsOnRight)
+  );
+  const flooredToPrecision =
+    Math.floor(float * 10 ** digitsOnRight) / 10 ** digitsOnRight;
+
+  const maxFormatOptions: Intl.NumberFormatOptions = Object.assign(
+    {
+      minimumFractionDigits: digitsOnRight,
+      maximumFractionDigits: digitsOnRight,
+    },
+    numberFormatOptions
+  );
+  return flooredToPrecision.toLocaleString(locale, maxFormatOptions);
+};
+
+const SI_SUFFIXES = {
+  t: 12,
+  b: 9,
+  m: 6,
+  k: 3,
+};
+
+export const formatNumberSI = (value: number): string => {
+  const result = Object.entries(SI_SUFFIXES).find(([_, power]) => {
+    return value >= 10 ** power;
+  });
+  if (!result) {
+    return value.toLocaleString();
+  }
+  const [suffix, power] = result;
+  const adjusted = value / 10 ** power;
+  return `${adjusted.toLocaleString(undefined, {
+    maximumSignificantDigits: 3,
+  })}${suffix}`;
+};
+
+export const formatDurationSeconds = (seconds: number) =>
+  formatDuration(
+    intervalToDuration({
+      start: new Date(0),
+      end: new Date(seconds * 1_000),
+    }),
+    { delimiter: ", " }
+  );
+
+export const formatSignificantDistance = (end: Date, start: Date) =>
+  formatDuration(
+    intervalToDuration({
+      start,
+      end,
+    }),
+    { delimiter: ", " }
+  )
+    .split(", ")
+    .slice(0, 3)
+    .join(", ");
+
+export const formatSignificantDistanceWithSuffix = (end: Date, start: Date) => {
+  const fmt = formatSignificantDistance(end, start);
+  return `${fmt} ${end < start ? "after" : "before"}`;
+};
diff --git a/helpers/idl/ve_honey.json b/helpers/idl/ve_honey.json
index 1592ece9..6a881173 100644
--- a/helpers/idl/ve_honey.json
+++ b/helpers/idl/ve_honey.json
@@ -44,6 +44,29 @@
         }
       ]
     },
+    {
+      "name": "setLockerParams",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "params",
+          "type": {
+            "defined": "LockerParams"
+          }
+        }
+      ]
+    },
     {
       "name": "initEscrow",
       "accounts": [
@@ -54,7 +77,397 @@
         },
         {
           "name": "locker",
-          "isMut": true,
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "approveProgramLockPrivilege",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "lockerAdmin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "whitelistEntry",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "executableId",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "whitelistedOwner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "revokeProgramLockPrivilege",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "lockerAdmin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "whitelistEntry",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "executableId",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "lock",
+      "accounts": [
+        {
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "lockedTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "sourceTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "sourceTokensAuthority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "amount",
+          "type": "u64"
+        },
+        {
+          "name": "duration",
+          "type": "i64"
+        }
+      ]
+    },
+    {
+      "name": "exit",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "lockedTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "destinationTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "migrateLocker",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "base",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "newBase",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "newLocker",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "smartWallet",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "proposalActivationMinVotes",
+          "type": "u64"
+        }
+      ]
+    },
+    {
+      "name": "migrateEscrow",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "lockerAdmin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "oldLocker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "newLocker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "oldEscrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "newEscrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "oldLockedTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "newLockedTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "migrateWhitelist",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "oldLocker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "newLocker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "lockerAdmin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "whitelistEntry",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "newWhitelistEntry",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "initLockerV2",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "base",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenMint",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "params",
+          "type": {
+            "defined": "LockerParamsV2"
+          }
+        }
+      ]
+    },
+    {
+      "name": "initEscrowV2",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": false,
           "isSigner": false
         },
         {
@@ -76,28 +489,61 @@
       "args": []
     },
     {
-      "name": "approveProgramLockPrivilege",
+      "name": "setLockerParamsV2",
       "accounts": [
         {
-          "name": "payer",
+          "name": "locker",
           "isMut": true,
-          "isSigner": true
+          "isSigner": false
         },
         {
-          "name": "locker",
+          "name": "governor",
           "isMut": false,
           "isSigner": false
         },
         {
-          "name": "lockerAdmin",
+          "name": "smartWallet",
           "isMut": false,
           "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "params",
+          "type": {
+            "defined": "LockerParamsV2"
+          }
+        }
+      ]
+    },
+    {
+      "name": "approveProgramLockPrivilegeV2",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
         },
         {
           "name": "whitelistEntry",
           "isMut": true,
           "isSigner": false
         },
+        {
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "smartWallet",
+          "isMut": false,
+          "isSigner": true
+        },
         {
           "name": "executableId",
           "isMut": false,
@@ -117,7 +563,7 @@
       "args": []
     },
     {
-      "name": "revokeProgramLockPrivilege",
+      "name": "revokeProgramLockPrivilegeV2",
       "accounts": [
         {
           "name": "payer",
@@ -129,26 +575,26 @@
           "isMut": false,
           "isSigner": false
         },
-        {
-          "name": "lockerAdmin",
-          "isMut": false,
-          "isSigner": true
-        },
         {
           "name": "whitelistEntry",
           "isMut": true,
           "isSigner": false
         },
         {
-          "name": "executableId",
+          "name": "governor",
           "isMut": false,
           "isSigner": false
+        },
+        {
+          "name": "smartWallet",
+          "isMut": false,
+          "isSigner": true
         }
       ],
       "args": []
     },
     {
-      "name": "lock",
+      "name": "lockV2",
       "accounts": [
         {
           "name": "locker",
@@ -198,7 +644,7 @@
       ]
     },
     {
-      "name": "exit",
+      "name": "exitV2",
       "accounts": [
         {
           "name": "payer",
@@ -237,6 +683,88 @@
         }
       ],
       "args": []
+    },
+    {
+      "name": "activateProposal",
+      "accounts": [
+        {
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "proposal",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrow",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "governProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "castVote",
+      "accounts": [
+        {
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "escrow",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "voteDelegate",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "proposal",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "vote",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "governProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "side",
+          "type": "u8"
+        }
+      ]
     }
   ],
   "accounts": [
@@ -276,6 +804,46 @@
         ]
       }
     },
+    {
+      "name": "EscrowV2",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "locker",
+            "type": "publicKey"
+          },
+          {
+            "name": "owner",
+            "type": "publicKey"
+          },
+          {
+            "name": "bump",
+            "type": "u8"
+          },
+          {
+            "name": "tokens",
+            "type": "publicKey"
+          },
+          {
+            "name": "amount",
+            "type": "u64"
+          },
+          {
+            "name": "escrowStartedAt",
+            "type": "i64"
+          },
+          {
+            "name": "escrowEndsAt",
+            "type": "i64"
+          },
+          {
+            "name": "voteDelegate",
+            "type": "publicKey"
+          }
+        ]
+      }
+    },
     {
       "name": "Locker",
       "type": {
@@ -310,6 +878,40 @@
         ]
       }
     },
+    {
+      "name": "LockerV2",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "base",
+            "type": "publicKey"
+          },
+          {
+            "name": "bump",
+            "type": "u8"
+          },
+          {
+            "name": "tokenMint",
+            "type": "publicKey"
+          },
+          {
+            "name": "lockedSupply",
+            "type": "u64"
+          },
+          {
+            "name": "governor",
+            "type": "publicKey"
+          },
+          {
+            "name": "params",
+            "type": {
+              "defined": "LockerParamsV2"
+            }
+          }
+        ]
+      }
+    },
     {
       "name": "WhitelistEntry",
       "type": {
@@ -359,6 +961,34 @@
           }
         ]
       }
+    },
+    {
+      "name": "LockerParamsV2",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "minStakeDuration",
+            "type": "u64"
+          },
+          {
+            "name": "maxStakeDuration",
+            "type": "u64"
+          },
+          {
+            "name": "proposalActivationMinVotes",
+            "type": "u64"
+          },
+          {
+            "name": "whitelistEnabled",
+            "type": "bool"
+          },
+          {
+            "name": "multiplier",
+            "type": "u8"
+          }
+        ]
+      }
     }
   ],
   "events": [
@@ -444,6 +1074,33 @@
         }
       ]
     },
+    {
+      "name": "InitLockerV2Event",
+      "fields": [
+        {
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "tokenMint",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "governor",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "params",
+          "type": {
+            "defined": "LockerParamsV2"
+          },
+          "index": false
+        }
+      ]
+    },
     {
       "name": "LockEvent",
       "fields": [
@@ -600,6 +1257,26 @@
       "code": 6011,
       "name": "EscrowNoBalance",
       "msg": "The escrow doesn't have balance"
+    },
+    {
+      "code": 6012,
+      "name": "ProposalMustBeActive",
+      "msg": "The proposal must be active"
+    },
+    {
+      "code": 6013,
+      "name": "GovernorMismatch",
+      "msg": "Governor mismatch"
+    },
+    {
+      "code": 6014,
+      "name": "ProgramIdMustBeExecutable",
+      "msg": "Program id must be executable"
+    },
+    {
+      "code": 6015,
+      "name": "InsufficientVotingPower",
+      "msg": "Insufficient voting power to activate a proposal"
     }
   ]
 }
diff --git a/helpers/instructions/parseNonAnchorInstruction.ts b/helpers/instructions/parseNonAnchorInstruction.ts
new file mode 100644
index 00000000..08c9f86e
--- /dev/null
+++ b/helpers/instructions/parseNonAnchorInstruction.ts
@@ -0,0 +1,145 @@
+import { extractErrorMessage } from "@saberhq/sail";
+import { TOKEN_PROGRAM_ID } from "@saberhq/token-utils";
+import type {
+  CreateAccountParams,
+  SystemInstructionType,
+  TransactionInstruction,
+  TransferParams,
+  WithdrawNonceParams,
+} from "@solana/web3.js";
+import { SystemInstruction, SystemProgram } from "@solana/web3.js";
+import { startCase } from "lodash";
+import type { Infer } from "superstruct";
+import { any, string, type } from "superstruct";
+
+import { MEMO_PROGRAM_ID } from "../constants";
+import type { TokenInstructionInner } from "./token/parsers";
+import { parseTokenInstruction } from "./token/parsers";
+import type { TokenInstructionType } from "./token/types";
+import { IX_TITLES } from "./token/types";
+import { BPF_UPGRADEABLE_LOADER_ID } from "./upgradeable_loader/instructions";
+import type { UpgradeableLoaderInstructionType } from "./upgradeable_loader/parsers";
+import { parseUpgradeableLoaderInstruction } from "./upgradeable_loader/parsers";
+
+export type MemoInstruction = {
+  program: "memo";
+  text: string;
+};
+
+export type TokenInstruction<
+  K extends TokenInstructionType = TokenInstructionType
+> = TokenInstructionInner & {
+  program: "token";
+  type: K;
+};
+
+export type UpgradeableLoaderInstruction = {
+  program: "upgradeable_loader";
+  type: UpgradeableLoaderInstructionType;
+};
+
+export type SystemProgramInstruction = {
+  program: "system";
+  type: SystemInstructionType;
+  decoded: TransferParams | CreateAccountParams | WithdrawNonceParams | null;
+};
+
+type ParsedNonAnchorInstructionInner =
+  | MemoInstruction
+  | TokenInstruction
+  | UpgradeableLoaderInstruction
+  | SystemProgramInstruction;
+
+export type ParsedNonAnchorInstruction<
+  T extends ParsedNonAnchorInstructionInner = ParsedNonAnchorInstructionInner
+> = T & {
+  name: string;
+  accountLabels?: string[];
+};
+
+type IXParser = (ix: TransactionInstruction) => ParsedNonAnchorInstruction;
+
+export type ParsedInfo = Infer<typeof ParsedInfo>;
+export const ParsedInfo = type({
+  type: string(),
+  info: any(),
+});
+
+export const PARSERS: Record<string, IXParser> = {
+  [MEMO_PROGRAM_ID.toString()]: (
+    ix
+  ): ParsedNonAnchorInstruction<MemoInstruction> => {
+    const text = ix.data.toString("utf-8");
+    return { text, name: "Memo", program: "memo" };
+  },
+  [TOKEN_PROGRAM_ID.toString()]: (
+    ix
+  ): ParsedNonAnchorInstruction<TokenInstruction> => {
+    const result = parseTokenInstruction(ix);
+    const name = IX_TITLES[result.type];
+    return { ...result, name, program: "token" };
+  },
+  [BPF_UPGRADEABLE_LOADER_ID.toString()]: (
+    ix
+  ): ParsedNonAnchorInstruction<UpgradeableLoaderInstruction> => {
+    const result = parseUpgradeableLoaderInstruction(ix);
+    return { ...result, program: "upgradeable_loader" };
+  },
+  [SystemProgram.programId.toString()]: (
+    ix
+  ): ParsedNonAnchorInstruction<SystemProgramInstruction> => {
+    const ixType = SystemInstruction.decodeInstructionType(ix);
+    const decoded = (() => {
+      switch (ixType) {
+        case "Transfer":
+          return SystemInstruction.decodeTransfer(ix);
+        case "TransferWithSeed":
+          return SystemInstruction.decodeTransferWithSeed(ix);
+        case "Create":
+          return SystemInstruction.decodeCreateAccount(ix);
+        case "WithdrawNonceAccount":
+          return SystemInstruction.decodeNonceWithdraw(ix);
+        default:
+          return null;
+      }
+    })();
+    return {
+      type: ixType,
+      decoded,
+      name: startCase(ixType),
+      program: "system",
+    };
+  },
+};
+
+export class InstructionParseError extends Error {
+  constructor(
+    readonly ix: TransactionInstruction,
+    readonly originalError: unknown
+  ) {
+    super(extractErrorMessage(originalError) ?? "unknown");
+    this.name = "InstructionParseError";
+    if (originalError instanceof Error) {
+      this.stack = originalError.stack;
+    }
+  }
+}
+
+export const parseNonAnchorInstruction = (
+  ix: TransactionInstruction
+):
+  | ParsedNonAnchorInstruction
+  | {
+      error: InstructionParseError;
+    }
+  | null => {
+  const parser = PARSERS[ix.programId.toString()];
+  if (!parser) {
+    return null;
+  }
+  try {
+    return parser(ix);
+  } catch (e) {
+    return { error: new InstructionParseError(ix, e) };
+  }
+};
diff --git a/helpers/instructions/token/parsers.ts b/helpers/instructions/token/parsers.ts
new file mode 100644
index 00000000..6b1eeab4
--- /dev/null
+++ b/helpers/instructions/token/parsers.ts
@@ -0,0 +1,115 @@
+import { structLayout, u64, Uint64Layout } from "@saberhq/token-utils";
+import * as BufferLayout from "@solana/buffer-layout";
+import type { PublicKey, TransactionInstruction } from "@solana/web3.js";
+
+import type { TokenInstructionType, Transfer, TransferChecked } from "./types";
+import { tokenInstructionTypes } from "./types";
+
+export type TokenInstructionData = Transfer | TransferChecked;
+
+type TokenDatas = {
+  transfer: Transfer;
+  transfer2: TransferChecked;
+};
+
+export type TokenInstructionInner =
+  | {
+      [K in keyof TokenDatas]: {
+        type: K;
+        data: TokenDatas[K] | null;
+      };
+    }[keyof TokenDatas]
+  | {
+      type: {
+        [K in TokenInstructionType]: K extends keyof TokenDatas ? never : K;
+      }[TokenInstructionType];
+      data: null;
+    };
+
+export type TokenIxData<K extends TokenInstructionType> =
+  K extends keyof TokenDatas ? TokenDatas[K] : null;
+
+export const parseTokenInstructionData = <
+  K extends TokenInstructionInner["type"]
+>(
+  type: K,
+  keys: PublicKey[],
+  data: Buffer
+): (TokenInstructionInner & { type: K })["data"] => {
+  switch (type) {
+    case "transfer": {
+      const dataLayout = BufferLayout.struct<{
+        amount: Uint8Array;
+      }>([Uint64Layout("amount")]);
+      const decoded = dataLayout.decode(data);
+      const [source, destination, authority] = keys;
+      if (!source || !destination || !authority) {
+        return null;
+      }
+      const amount = u64.fromBuffer(Buffer.from(decoded.amount));
+      return {
+        source,
+        destination,
+        amount: amount.toString(),
+        authority,
+      };
+    }
+    case "transfer2": {
+      const dataLayout = structLayout<{
+        amount: Uint8Array;
+        decimals: number;
+      }>([Uint64Layout("amount"), BufferLayout.u8("decimals")]);
+      const decoded = dataLayout.decode(data);
+      const [source, mint, destination, authority] = keys;
+      if (!source || !destination || !mint) {
+        return null;
+      }
+      const amount = u64.fromBuffer(Buffer.from(decoded.amount));
+      return {
+        source,
+        destination,
+        mint,
+        tokenAmount: {
+          amount: amount.toString(),
+          decimals: decoded.decimals,
+          uiAmountString: amount.toString(),
+        },
+        authority,
+      };
+    }
+  }
+  return null;
+};
+
+const accountLabels: { [K in TokenInstructionType]?: string[] } = {
+  transfer: ["Source", "Destination", "Authority"],
+  transfer2: ["Source", "Mint", "Destination", "Authority"],
+};
+
+export const parseTokenInstruction = (
+  ix: TransactionInstruction
+): TokenInstructionInner & {
+  accountLabels?: string[];
+} => {
+  const ixLayout = structLayout<{
+    instruction: number;
+  }>([BufferLayout.u8("instruction")]);
+  const { instruction } = ixLayout.decode(ix.data);
+  const rest = ix.data.slice(1);
+  const ixType = tokenInstructionTypes[instruction];
+  if (!ixType) {
+    throw new Error("ix type");
+  }
+  const data = parseTokenInstructionData(
+    ixType,
+    ix.keys.map((k) => k.pubkey),
+    rest
+  );
+  return {
+    type: ixType,
+    data,
+    accountLabels: accountLabels[ixType],
+  } as TokenInstructionInner & {
+    accountLabels?: string[];
+  };
+};
diff --git a/helpers/instructions/token/types.ts b/helpers/instructions/token/types.ts
new file mode 100644
index 00000000..1045a478
--- /dev/null
+++ b/helpers/instructions/token/types.ts
@@ -0,0 +1,237 @@
+import type { Infer } from "superstruct";
+import {
+  array,
+  enums,
+  nullable,
+  number,
+  optional,
+  string,
+  type,
+  union,
+} from "superstruct";
+
+import { PublicKeyFromString } from "../../validators/pubkey";
+
+export type TokenAmountUi = Infer<typeof TokenAmountUi>;
+export const TokenAmountUi = type({
+  amount: string(),
+  decimals: number(),
+  uiAmountString: string(),
+});
+
+const InitializeMint = type({
+  mint: PublicKeyFromString,
+  decimals: number(),
+  mintAuthority: PublicKeyFromString,
+  rentSysvar: PublicKeyFromString,
+  freezeAuthority: optional(PublicKeyFromString),
+});
+
+const InitializeAccount = type({
+  account: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  owner: PublicKeyFromString,
+  rentSysvar: PublicKeyFromString,
+});
+
+const InitializeMultisig = type({
+  multisig: PublicKeyFromString,
+  rentSysvar: PublicKeyFromString,
+  signers: array(PublicKeyFromString),
+  m: number(),
+});
+
+export type Transfer = Infer<typeof Transfer>;
+export const Transfer = type({
+  source: PublicKeyFromString,
+  destination: PublicKeyFromString,
+  amount: union([string(), number()]),
+  authority: optional(PublicKeyFromString),
+  multisigAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const Approve = type({
+  source: PublicKeyFromString,
+  delegate: PublicKeyFromString,
+  amount: union([string(), number()]),
+  owner: optional(PublicKeyFromString),
+  multisigOwner: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const Revoke = type({
+  source: PublicKeyFromString,
+  owner: optional(PublicKeyFromString),
+  multisigOwner: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const AuthorityType = enums([
+  "mintTokens",
+  "freezeAccount",
+  "accountOwner",
+  "closeAccount",
+]);
+
+const SetAuthority = type({
+  mint: optional(PublicKeyFromString),
+  account: optional(PublicKeyFromString),
+  authorityType: AuthorityType,
+  newAuthority: nullable(PublicKeyFromString),
+  authority: optional(PublicKeyFromString),
+  multisigAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const MintTo = type({
+  mint: PublicKeyFromString,
+  account: PublicKeyFromString,
+  amount: union([string(), number()]),
+  mintAuthority: optional(PublicKeyFromString),
+  multisigMintAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const Burn = type({
+  account: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  amount: union([string(), number()]),
+  authority: optional(PublicKeyFromString),
+  multisigAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const CloseAccount = type({
+  account: PublicKeyFromString,
+  destination: PublicKeyFromString,
+  owner: optional(PublicKeyFromString),
+  multisigOwner: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const FreezeAccount = type({
+  account: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  freezeAuthority: optional(PublicKeyFromString),
+  multisigFreezeAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const ThawAccount = type({
+  account: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  freezeAuthority: optional(PublicKeyFromString),
+  multisigFreezeAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+export type TransferChecked = Infer<typeof TransferChecked>;
+export const TransferChecked = type({
+  source: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  destination: PublicKeyFromString,
+  authority: optional(PublicKeyFromString),
+  multisigAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+  tokenAmount: TokenAmountUi,
+});
+
+const ApproveChecked = type({
+  source: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  delegate: PublicKeyFromString,
+  owner: optional(PublicKeyFromString),
+  multisigOwner: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+  tokenAmount: TokenAmountUi,
+});
+
+const MintToChecked = type({
+  account: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  mintAuthority: optional(PublicKeyFromString),
+  multisigMintAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+  tokenAmount: TokenAmountUi,
+});
+
+const BurnChecked = type({
+  account: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  authority: optional(PublicKeyFromString),
+  multisigAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+  tokenAmount: TokenAmountUi,
+});
+
+export const tokenInstructionTypes = [
+  "initializeMint",
+  "initializeAccount",
+  "initializeMultisig",
+  "transfer",
+  "approve",
+  "revoke",
+  "setAuthority",
+  "mintTo",
+  "burn",
+  "closeAccount",
+  "freezeAccount",
+  "thawAccount",
+  "transfer2",
+  "approve2",
+  "mintTo2",
+  "burn2",
+  "transferChecked",
+  "approveChecked",
+  "mintToChecked",
+  "burnChecked",
+] as const;
+export type TokenInstructionType = Infer<typeof TokenInstructionType>;
+export const TokenInstructionType = enums(tokenInstructionTypes);
+
+export const IX_STRUCTS = {
+  initializeMint: InitializeMint,
+  initializeAccount: InitializeAccount,
+  initializeMultisig: InitializeMultisig,
+  transfer: Transfer,
+  approve: Approve,
+  revoke: Revoke,
+  setAuthority: SetAuthority,
+  mintTo: MintTo,
+  burn: Burn,
+  closeAccount: CloseAccount,
+  freezeAccount: FreezeAccount,
+  thawAccount: ThawAccount,
+  transfer2: TransferChecked,
+  approve2: ApproveChecked,
+  mintTo2: MintToChecked,
+  burn2: BurnChecked,
+  transferChecked: TransferChecked,
+  approveChecked: ApproveChecked,
+  mintToChecked: MintToChecked,
+  burnChecked: BurnChecked,
+};
+
+export const IX_TITLES = {
+  initializeMint: "Initialize Mint",
+  initializeAccount: "Initialize Account",
+  initializeMultisig: "Initialize Multisig",
+  transfer: "Transfer",
+  approve: "Approve",
+  revoke: "Revoke",
+  setAuthority: "Set Authority",
+  mintTo: "Mint To",
+  burn: "Burn",
+  closeAccount: "Close Account",
+  freezeAccount: "Freeze Account",
+  thawAccount: "Thaw Account",
+  transfer2: "Transfer (Checked)",
+  approve2: "Approve (Checked)",
+  mintTo2: "Mint To (Checked)",
+  burn2: "Burn (Checked)",
+  transferChecked: "Transfer (Checked)",
+  approveChecked: "Approve (Checked)",
+  mintToChecked: "Mint To (Checked)",
+  burnChecked: "Burn (Checked)",
+};
diff --git a/helpers/instructions/upgradeable_loader/instructions.ts b/helpers/instructions/upgradeable_loader/instructions.ts
new file mode 100644
index 00000000..3faf68a9
--- /dev/null
+++ b/helpers/instructions/upgradeable_loader/instructions.ts
@@ -0,0 +1,223 @@
+// https://github.com/solana-labs/solana/blob/master/sdk/program/src/loader_upgradeable_instruction.rs
+
+import type { AccountMeta } from "@solana/web3.js";
+import {
+  PublicKey,
+  SYSVAR_CLOCK_PUBKEY,
+  SYSVAR_RENT_PUBKEY,
+  TransactionInstruction,
+} from "@solana/web3.js";
+
+import { makeUpgradeableLoaderInstructionData } from "./parsers";
+
+export const BPF_UPGRADEABLE_LOADER_ID = new PublicKey(
+  "BPFLoaderUpgradeab1e11111111111111111111111"
+);
+
+interface Upgrade {
+  program: PublicKey;
+  buffer: PublicKey;
+  spill: PublicKey;
+  signer: PublicKey;
+}
+
+/**
+ * Upgrade a program.
+ *
+ * A program can be updated as long as the program's authority has not been
+ * set to `None`.
+ *
+ * The Buffer account must contain sufficient lamports to fund the
+ * ProgramData account to be rent-exempt, any additional lamports left over
+ * will be transferred to the spill account, leaving the Buffer account
+ * balance at zero.
+ *
+ * # Account references
+ *   0. `[writable]` The ProgramData account.
+ *   1. `[writable]` The Program account.
+ *   2. `[writable]` The Buffer account where the program data has been
+ *      written.  The buffer account's authority must match the program's
+ *      authority
+ *   3. `[writable]` The spill account.
+ *   4. `[]` Rent sysvar.
+ *   5. `[]` Clock sysvar.
+ *   6. `[signer]` The program's authority.
+ */
+export const createUpgradeInstruction = async ({
+  program,
+  buffer,
+  spill,
+  signer,
+}: Upgrade): Promise<TransactionInstruction> => {
+  const [programData] = await PublicKey.findProgramAddress(
+    [program.toBuffer()],
+    BPF_UPGRADEABLE_LOADER_ID
+  );
+  return new TransactionInstruction({
+    programId: BPF_UPGRADEABLE_LOADER_ID,
+    data: makeUpgradeableLoaderInstructionData("upgrade"),
+    keys: [
+      {
+        pubkey: programData,
+        isSigner: false,
+        isWritable: true,
+      },
+      {
+        pubkey: program,
+        isSigner: false,
+        isWritable: true,
+      },
+      {
+        pubkey: buffer,
+        isSigner: false,
+        isWritable: true,
+      },
+      {
+        pubkey: spill,
+        isSigner: false,
+        isWritable: true,
+      },
+      {
+        pubkey: SYSVAR_RENT_PUBKEY,
+        isSigner: false,
+        isWritable: false,
+      },
+      {
+        pubkey: SYSVAR_CLOCK_PUBKEY,
+        isSigner: false,
+        isWritable: false,
+      },
+      {
+        pubkey: signer,
+        isSigner: true,
+        isWritable: false,
+      },
+    ],
+  });
+};
+
+interface SetAuthority {
+  account: PublicKey;
+  authority: PublicKey;
+  nextAuthority: PublicKey;
+}
+
+export const findProgramDataAddress = (programID: PublicKey) =>
+  PublicKey.findProgramAddress(
+    [programID.toBuffer()],
+    BPF_UPGRADEABLE_LOADER_ID
+  );
+
+/**
+ * Set a new authority that is allowed to write the buffer or upgrade the
+ * program.  To permanently make the buffer immutable or disable program
+ * updates omit the new authority.
+ *
+ * # Account references
+ *   0. `[writable]` The Buffer or ProgramData account to change the
+ *      authority of.
+ *   1. `[signer]` The current authority.
+ *   2. `[]` The new authority, optional, if omitted then the program will
+ *      not be upgradeable.
+ */
+export const createSetAuthorityInstruction = ({
+  account,
+  authority,
+  nextAuthority,
+}: SetAuthority): TransactionInstruction => {
+  return new TransactionInstruction({
+    programId: BPF_UPGRADEABLE_LOADER_ID,
+    data: makeUpgradeableLoaderInstructionData("setAuthority"),
+    keys: [
+      {
+        pubkey: account,
+        isSigner: false,
+        isWritable: true,
+      },
+      {
+        pubkey: authority,
+        isSigner: true,
+        isWritable: false,
+      },
+      {
+        pubkey: nextAuthority,
+        isSigner: false,
+        isWritable: false,
+      },
+    ],
+  });
+};
+
+interface Close {
+  /**
+   * The account to close, if closing a program must be the
+   * ProgramData account.
+   */
+  account: PublicKey;
+  /**
+   * The account to deposit the closed account's lamports.
+   */
+  spill: PublicKey;
+  /**
+   * The account's authority, Optional, required for
+   * initialized accounts.
+   */
+  authority?: PublicKey;
+  /**
+   * The associated Program account if the account to close
+   * is a ProgramData account.
+   */
+  program?: PublicKey;
+}
+
+/**
+ * Closes an account owned by the upgradeable loader of all lamports and
+ * withdraws all the lamports
+ *
+ * # Account references
+ *   0. `[writable]` The account to close, if closing a program must be the
+ *      ProgramData account.
+ *   1. `[writable]` The account to deposit the closed account's lamports.
+ *   2. `[signer]` The account's authority, Optional, required for
+ *      initialized accounts.
+ *   3. `[writable]` The associated Program account if the account to close
+ *      is a ProgramData account.
+ */
+export const createCloseInstruction = ({
+  account,
+  spill,
+  authority,
+  program,
+}: Close): TransactionInstruction => {
+  const keys: AccountMeta[] = [
+    {
+      pubkey: account,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: spill,
+      isSigner: false,
+      isWritable: true,
+    },
+  ];
+  if (authority) {
+    keys.push({
+      pubkey: authority,
+      isSigner: true,
+      isWritable: false,
+    });
+    if (program) {
+      keys.push({
+        pubkey: program,
+        isSigner: false,
+        isWritable: true,
+      });
+    }
+  }
+  return new TransactionInstruction({
+    programId: BPF_UPGRADEABLE_LOADER_ID,
+    data: makeUpgradeableLoaderInstructionData("close"),
+    keys,
+  });
+};
diff --git a/helpers/instructions/upgradeable_loader/parsers.ts b/helpers/instructions/upgradeable_loader/parsers.ts
new file mode 100644
index 00000000..3f720ed1
--- /dev/null
+++ b/helpers/instructions/upgradeable_loader/parsers.ts
@@ -0,0 +1,72 @@
+import * as BufferLayout from "@solana/buffer-layout";
+import type { TransactionInstruction } from "@solana/web3.js";
+import { startCase } from "lodash";
+
+const instructions = [
+  "initializeBuffer",
+  "write",
+  "deployWithMaxDataLen",
+  "upgrade",
+  "setAuthority",
+  "close",
+] as const;
+
+export type UpgradeableLoaderInstructionType = typeof instructions[number];
+
+export const makeUpgradeableLoaderInstructionData = (
+  type: UpgradeableLoaderInstructionType
+): Buffer => {
+  return Buffer.from([instructions.indexOf(type), 0, 0, 0]);
+};
+
+export type UpgradeableLoaderInstructionData = {
+  name: string;
+  type: UpgradeableLoaderInstructionType;
+  accountLabels?: string[];
+};
+
+/**
+ * See: <https://github.com/solana-labs/solana/blob/master/sdk/program/src/loader_upgradeable_instruction.rs>
+ */
+const accountLabels: { [K in UpgradeableLoaderInstructionType]?: string[] } = {
+  initializeBuffer: ["Buffer", "Buffer Authority"],
+  write: ["Buffer", "Buffer Authority"],
+  deployWithMaxDataLen: [
+    "Payer",
+    "Program Data",
+    "Program",
+    "Buffer",
+    "Rent",
+    "Clock",
+    "Program Authority",
+  ],
+  upgrade: [
+    "Program Data",
+    "Program",
+    "Buffer",
+    "Spill",
+    "Rent",
+    "Clock",
+    "Program Authority",
+  ],
+  setAuthority: ["Account", "Authority", "Next Authority"],
+  close: ["Account", "Spill", "Authority", "Program"],
+};
+
+export const parseUpgradeableLoaderInstruction = (
+  ix: TransactionInstruction
+): UpgradeableLoaderInstructionData => {
+  const ixLayout = BufferLayout.struct<{
+    instruction: number;
+  }>([BufferLayout.u32("instruction")]);
+  const { instruction } = ixLayout.decode(ix.data);
+  const ixType = instructions[instruction];
+  if (!ixType) {
+    throw new Error("ix type");
+  }
+  return {
+    type: ixType,
+    name: startCase(ixType as string),
+    accountLabels: accountLabels[ixType],
+  };
+};
diff --git a/helpers/instructions/upgradeable_loader/types.ts b/helpers/instructions/upgradeable_loader/types.ts
new file mode 100644
index 00000000..8a40eae7
--- /dev/null
+++ b/helpers/instructions/upgradeable_loader/types.ts
@@ -0,0 +1,188 @@
+import { u64 } from '@saberhq/token-utils';
+import { PublicKey } from '@solana/web3.js';
+import type { Infer } from 'superstruct';
+import {
+  any,
+  coerce,
+  create,
+  literal,
+  nullable,
+  number,
+  type,
+  union
+} from 'superstruct';
+
+import { PublicKeyFromString } from '../../validators/pubkey';
+import { ParsedInfo } from '../parseNonAnchorInstruction';
+
+export type ProgramAccountInfo = Infer<typeof ProgramAccountInfo>;
+export const ProgramAccountInfo = type({
+  programData: PublicKeyFromString
+});
+
+export type ProgramAccount = Infer<typeof ProgramDataAccount>;
+export const ProgramAccount = type({
+  type: literal('program'),
+  info: ProgramAccountInfo
+});
+
+export type ProgramDataAccountInfo = Infer<typeof ProgramDataAccountInfo>;
+export const ProgramDataAccountInfo = type({
+  authority: nullable(PublicKeyFromString),
+  // don't care about data yet
+  slot: number()
+});
+
+export type ProgramDataAccount = Infer<typeof ProgramDataAccount>;
+export const ProgramDataAccount = type({
+  type: literal('programData'),
+  info: ProgramDataAccountInfo
+});
+
+export type ProgramBufferAccountInfo = Infer<typeof ProgramBufferAccountInfo>;
+export const ProgramBufferAccountInfo = type({
+  authority: nullable(PublicKeyFromString)
+  // don't care about data yet
+});
+
+export type ProgramBufferAccount = Infer<typeof ProgramBufferAccount>;
+export const ProgramBufferAccount = type({
+  type: literal('buffer'),
+  info: ProgramBufferAccountInfo
+});
+
+export type ProgramUninitializedAccountInfo = Infer<
+  typeof ProgramUninitializedAccountInfo
+>;
+export const ProgramUninitializedAccountInfo = any();
+
+export type ProgramUninitializedAccount = Infer<
+  typeof ProgramUninitializedAccount
+>;
+export const ProgramUninitializedAccount = type({
+  type: literal('uninitialized'),
+  info: ProgramUninitializedAccountInfo
+});
+
+const ACCOUNT_TYPE_SIZE = 4;
+const SLOT_SIZE = 8; // size_of::<u64>();
+const OPTION_SIZE = 1;
+const PUBKEY_LEN = 32;
+
+export type BPFUpgradeableLoaderAccount =
+  | {
+      type: 'uninitialized';
+    }
+  | {
+      type: 'buffer';
+      authority: PublicKey;
+      data: Uint8Array;
+    }
+  | {
+      type: 'program';
+      programData: PublicKey;
+    }
+  | {
+      type: 'programData';
+      slot: u64;
+      upgradeAuthority: PublicKey;
+      data: Uint8Array;
+    }
+  | {
+      type: 'error';
+    };
+
+/**
+ * raw: https://github.com/solana-labs/solana/blob/master/sdk/program/src/bpf_loader_upgradeable.rs
+ */
+export const decodeBPFUpgradeableLoaderAccount = (
+  data: Uint8Array
+): BPFUpgradeableLoaderAccount => {
+  const type = data.slice(0, ACCOUNT_TYPE_SIZE);
+  const rest = data.slice(ACCOUNT_TYPE_SIZE);
+  switch (type[0]) {
+    case 0: {
+      return {
+        type: 'uninitialized'
+      };
+    }
+    case 1: {
+      return {
+        type: 'buffer',
+        authority: new PublicKey(
+          Buffer.from(rest.slice(OPTION_SIZE, OPTION_SIZE + PUBKEY_LEN))
+        ),
+        data: rest.slice(OPTION_SIZE + PUBKEY_LEN)
+      };
+    }
+    case 2: {
+      return {
+        type: 'program',
+        programData: new PublicKey(rest.slice(0, PUBKEY_LEN))
+      };
+    }
+    case 3: {
+      return {
+        type: 'programData',
+        slot: u64.fromBuffer(Buffer.from(rest.slice(0, SLOT_SIZE))),
+        upgradeAuthority: new PublicKey(
+          rest.slice(
+            SLOT_SIZE + OPTION_SIZE,
+            SLOT_SIZE + OPTION_SIZE + PUBKEY_LEN
+          )
+        ),
+        data: rest.slice(SLOT_SIZE + PUBKEY_LEN)
+      };
+    }
+    default: {
+      return {
+        type: 'error'
+      };
+    }
+  }
+};
+
+export type UpgradeableLoaderAccount = Infer<typeof UpgradeableLoaderAccount>;
+export const UpgradeableLoaderAccount = coerce(
+  union([
+    ProgramAccount,
+    ProgramDataAccount,
+    ProgramBufferAccount,
+    ProgramUninitializedAccount
+  ]),
+  ParsedInfo,
+  value => {
+    // Coercions like `PublicKeyFromString` are not applied within
+    // union validators so we use this custom coercion as a workaround.
+    switch (value.type) {
+      case 'program': {
+        return {
+          type: value.type,
+          info: create(value.info, ProgramAccountInfo)
+        };
+      }
+      case 'programData': {
+        return {
+          type: value.type,
+          info: create(value.info, ProgramDataAccountInfo)
+        };
+      }
+      case 'buffer': {
+        return {
+          type: value.type,
+          info: create(value.info, ProgramBufferAccountInfo)
+        };
+      }
+      case 'uninitialized': {
+        return {
+          type: value.type,
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+          info: create(value.info, ProgramUninitializedAccountInfo)
+        };
+      }
+      default: {
+        throw new Error(`Unknown program account type: ${value.type}`);
+      }
+    }
+  }
+);
diff --git a/helpers/parser.ts b/helpers/parser.ts
new file mode 100644
index 00000000..8271062d
--- /dev/null
+++ b/helpers/parser.ts
@@ -0,0 +1,66 @@
+import { GOKI_CODERS } from '@gokiprotocol/client';
+import { makeParserHooks, makeProgramParserHooks } from '@saberhq/sail';
+import { SNAPSHOTS_CODERS } from '@saberhq/snapshots';
+
+import { HONEY_DAO_CODERS } from './sdk';
+
+const parserHooks = makeParserHooks({
+  ...HONEY_DAO_CODERS.Govern.accountParsers,
+  ...HONEY_DAO_CODERS.LockedVoter.accountParsers,
+  ...GOKI_CODERS.SmartWallet.accountParsers
+});
+
+export const {
+  proposal: { useData: useParsedProposals, useSingleData: useParsedProposal },
+  proposalMeta: {
+    useData: useParsedProposalMetas,
+    useSingleData: useParsedProposalMeta
+  },
+  locker: { useData: useParsedLockers, useSingleData: useParsedLocker },
+  escrow: { useData: useParsedEscrows, useSingleData: useParsedEscrow },
+  governor: { useData: useParsedGovernors, useSingleData: useParsedGovernor },
+  vote: { useData: useParsedVotes, useSingleData: useParsedVote },
+  transaction: { useData: useParsedTXByKeys, useSingleData: useParsedTXByKey }
+} = parserHooks;
+
+export const {
+  proposal: { useData: useProposalsData, useSingleData: useProposalData },
+  proposalMeta: {
+    useData: useProposalMetasData,
+    useSingleData: useProposalMetaData
+  },
+  governor: { useData: useGovernorsData, useSingleData: useGovernorData },
+  vote: { useData: useVotesData, useSingleData: useVoteData }
+} = makeProgramParserHooks(HONEY_DAO_CODERS.Govern);
+
+export const {
+  subaccountInfo: {
+    useData: useSubaccountInfosData,
+    useBatchedData: useBatchedSubaccountInfos,
+    useSingleData: useSubaccountInfoData
+  },
+  transaction: {
+    useData: useGokiTransactionsData,
+    useBatchedData: useBatchedGokiTransactions,
+    useSingleData: useGokiTransactionData
+  },
+  smartWallet: { useSingleData: useGokiSmartWalletData }
+} = makeProgramParserHooks(GOKI_CODERS.SmartWallet);
+
+export const {
+  escrow: { useSingleData: useEscrowData },
+  locker: { useSingleData: useLockerData }
+} = makeProgramParserHooks(HONEY_DAO_CODERS.LockedVoter);
+
+export const {
+  lockerHistory: {
+    useSingleData: useLockerHistoriesData,
+    useData: useLockerHistoryData,
+    useBatchedData: useBatchedLockerHistories
+  },
+  escrowHistory: {
+    useSingleData: useEscrowHistoriesData,
+    useData: useEscrowHistoryData,
+    useBatchedData: useBatchedEscrowHistories
+  }
+} = makeProgramParserHooks(SNAPSHOTS_CODERS.Snapshots);
diff --git a/helpers/programs/veHoney.ts b/helpers/programs/veHoney.ts
new file mode 100644
index 00000000..773c49b5
--- /dev/null
+++ b/helpers/programs/veHoney.ts
@@ -0,0 +1,22 @@
+import type { AnchorTypes } from '@saberhq/anchor-contrib';
+
+import type { VeHoney as VoterIDL } from '../types/ve_honey';
+
+export type LockedVoterTypes = AnchorTypes<
+  VoterIDL,
+  {
+    locker: LockerData;
+    escrow: EscrowData;
+    lockerWhitelistEntry: LockerWhitelistEntryData;
+  }
+>;
+
+type Accounts = LockedVoterTypes['Accounts'];
+export type LockerData = Accounts['lockerV2'];
+export type EscrowData = Accounts['escrowV2'];
+export type LockerWhitelistEntryData = Accounts['whitelistEntry'];
+
+export type LockerParams = LockedVoterTypes['Defined']['LockerParamsV2'];
+
+export type LockedVoterError = LockedVoterTypes['Error'];
+export type LockedVoterProgram = LockedVoterTypes['Program'];
diff --git a/helpers/sdk/constant.ts b/helpers/sdk/constant.ts
index 1bd95fda..697ecea7 100644
--- a/helpers/sdk/constant.ts
+++ b/helpers/sdk/constant.ts
@@ -1,4 +1,9 @@
 import { PublicKey } from '@solana/web3.js';
+import { buildCoderMap } from '@saberhq/anchor-contrib';
+import type { GovernTypes } from '@tribecahq/tribeca-sdk';
+import { GovernJSON } from '@tribecahq/tribeca-sdk';
+import type { LockedVoterTypes } from 'helpers/programs/veHoney';
+import { IDL } from 'helpers/types/ve_honey';
 
 export const HONEY_WADS = 1000000;
 
@@ -17,3 +22,29 @@ export const WHITELIST_ENTRY = new PublicKey(
 );
 
 export const PHONEY_DECIMALS = 6;
+
+// See `Anchor.toml` for all addresses.
+export const HONEY_DAO_ADDRESSES = {
+  Govern: new PublicKey('Govz1VyoyLD5BL6CSCxUJLVLsQHRwjfFj1prNsdNg5Jw'),
+  LockedVoter: new PublicKey('5i6s4zbxYGDhY1UGNZwrtBUAp7u2fnJ8ZSXu39eZWjNT')
+};
+
+/**
+ * Program IDLs.
+ */
+export const HONEY_DAO_IDLS = {
+  Govern: GovernJSON,
+  LockedVoter: IDL
+};
+
+export const HONEY_DAO_CODERS = buildCoderMap<{
+  Govern: GovernTypes;
+  LockedVoter: LockedVoterTypes;
+}>(HONEY_DAO_IDLS, HONEY_DAO_ADDRESSES);
+
+export const PROPOSAL_TITLE_MAX_LEN = 140;
+
+export const GOVERNOR_ADDRESS = new PublicKey(
+  process.env.NEXT_PUBLIC_GOVERNOR_ADDRESS ||
+    'H8Vs8jXXXRW2JTcxhXb2bnngxvmHWdbmExVNjrj5YXvr'
+);
diff --git a/helpers/sdk/gov.ts b/helpers/sdk/gov.ts
new file mode 100644
index 00000000..72643567
--- /dev/null
+++ b/helpers/sdk/gov.ts
@@ -0,0 +1,84 @@
+import type { GOKI_ADDRESSES } from '@gokiprotocol/client';
+import { GokiSDK } from '@gokiprotocol/client';
+import { useNativeAccount } from '@saberhq/sail';
+import { SignerWallet, SolanaProvider } from '@saberhq/solana-contrib';
+import type { TokenAmount } from '@saberhq/token-utils';
+import { useConnectedWallet, useConnectionContext } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import { Keypair } from '@solana/web3.js';
+import { TribecaSDK } from '@tribecahq/tribeca-sdk';
+import { useMemo } from 'react';
+import { createContainer } from 'unstated-next';
+
+export type ProgramKey = keyof typeof GOKI_ADDRESSES;
+
+export const useSDKInternal = (): {
+  sdk: GokiSDK;
+  sdkMut: GokiSDK | null;
+  owner: PublicKey | null;
+  nativeBalance?: TokenAmount | null;
+  tribecaMut: TribecaSDK | null;
+} => {
+  const { connection } = useConnectionContext();
+  const wallet = useConnectedWallet();
+
+  const { sdk: sdk } = useMemo(() => {
+    const provider = SolanaProvider.init({
+      connection,
+      wallet: new SignerWallet(Keypair.generate()),
+      opts: {
+        commitment: 'recent'
+      }
+    });
+    return {
+      sdk: GokiSDK.load({ provider })
+    };
+  }, [connection]);
+
+  const { sdkMut } = useMemo(() => {
+    if (!wallet) {
+      return { sdkMut: null };
+    }
+    const provider = SolanaProvider.init({
+      connection,
+      wallet,
+      opts: {
+        commitment: 'recent'
+      }
+    });
+    return {
+      sdkMut: GokiSDK.load({ provider })
+    };
+  }, [connection, wallet]);
+
+  const tribecaMut = useMemo(() => {
+    if (!wallet) {
+      return null;
+    }
+    const provider = SolanaProvider.init({
+      connection,
+      wallet,
+      opts: {
+        commitment: 'recent'
+      }
+    });
+    return TribecaSDK.load({ provider });
+  }, [connection, wallet]);
+
+  const owner = useMemo(
+    () => sdkMut?.provider.wallet.publicKey ?? null,
+    [sdkMut?.provider.wallet.publicKey]
+  );
+  const { nativeBalance } = useNativeAccount();
+
+  return {
+    owner,
+    nativeBalance,
+    sdk,
+    sdkMut: sdkMut ?? null,
+    tribecaMut
+  };
+};
+
+export const { useContainer: useSDK, Provider: SDKProvider } =
+  createContainer(useSDKInternal);
diff --git a/helpers/sdk/index.ts b/helpers/sdk/index.ts
index 3ca89334..bc1993f0 100644
--- a/helpers/sdk/index.ts
+++ b/helpers/sdk/index.ts
@@ -1,3 +1,4 @@
 export * from './constant';
 export * from './stake';
 export * from './vehoney';
+export * from './gov';
diff --git a/helpers/sdk/vehoney.ts b/helpers/sdk/vehoney.ts
index 76a2aacc..454326e5 100644
--- a/helpers/sdk/vehoney.ts
+++ b/helpers/sdk/vehoney.ts
@@ -55,15 +55,16 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
         escrow,
         this.wallet.publicKey
       ),
-      this.program.instruction.initEscrow({
-        accounts: {
+      await this.program.methods
+        .initEscrow()
+        .accounts({
           payer: this.wallet.publicKey,
           locker,
           escrow,
           escrowOwner: this.wallet.publicKey,
           systemProgram: anchor.web3.SystemProgram.programId
-        }
-      })
+        })
+        .instruction()
     ];
   }
 
@@ -76,8 +77,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
       [escrow] = await this.getEscrowPDA(locker);
     }
 
-    let preInstructions: anchor.web3.TransactionInstruction[] | undefined =
-      undefined;
+    let preInstructions: anchor.web3.TransactionInstruction[] = [];
     if (!destination) {
       destination = await Token.getAssociatedTokenAddress(
         ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -86,7 +86,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
         this.wallet.publicKey
       );
 
-      preInstructions = [
+      preInstructions.push(
         Token.createAssociatedTokenAccountInstruction(
           ASSOCIATED_TOKEN_PROGRAM_ID,
           TOKEN_PROGRAM_ID,
@@ -95,13 +95,14 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
           this.wallet.publicKey,
           this.wallet.publicKey
         )
-      ];
+      );
     }
 
     const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
 
-    const txSig = await this.program.rpc.exit({
-      accounts: {
+    const txSig = await this.program.methods
+      .exit()
+      .accounts({
         payer: this.wallet.publicKey,
         locker,
         escrow,
@@ -109,9 +110,9 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
         lockedTokens,
         destinationTokens: destination,
         tokenProgram: TOKEN_PROGRAM_ID
-      },
-      preInstructions
-    });
+      })
+      .preInstructions(preInstructions)
+      .rpc();
 
     return { txSig, destination };
   }
@@ -123,9 +124,10 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
     duration: anchor.BN,
     hasEscrow?: boolean
   ) {
-    const preInstructions = !hasEscrow
-      ? [...(await this.createInitializeEscrowIx(locker))]
-      : undefined;
+    const preInstructions = [];
+    if (!hasEscrow) {
+      preInstructions.push(...(await this.createInitializeEscrowIx(locker)));
+    }
 
     const remainingAccounts = [
       {
@@ -143,26 +145,159 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
     const [escrow] = await this.getEscrowPDA(locker);
     const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
 
-    const txSig = await this.program.rpc.lock(
-      new anchor.BN(amount),
-      new anchor.BN(duration),
-      {
-        accounts: {
+    const txSig = await this.program.methods
+      .lock(new anchor.BN(amount), new anchor.BN(duration))
+      .accounts({
+        locker,
+        escrow,
+        lockedTokens,
+        escrowOwner: this.wallet.publicKey,
+        sourceTokens: source,
+        sourceTokensAuthority: this.wallet.publicKey,
+        tokenProgram: TOKEN_PROGRAM_ID
+      })
+      .remainingAccounts(remainingAccounts)
+      .preInstructions(preInstructions)
+      .rpc();
+    return { txSig, escrow };
+  }
+
+  async fetchLockerV2(locker: PublicKey) {
+    try {
+      return await this.program.account.lockerV2.fetch(locker);
+    } catch (e) {
+      console.log(e);
+    }
+  }
+
+  async fetchEscrowV2(escrow: PublicKey) {
+    try {
+      return await this.program.account.escrowV2.fetch(escrow);
+    } catch (e) {
+      console.log(e);
+    }
+  }
+
+  async createInitializeEscrowV2Ix(locker: PublicKey) {
+    const [escrow] = await this.getEscrowPDA(locker);
+    const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
+
+    return [
+      Token.createAssociatedTokenAccountInstruction(
+        ASSOCIATED_TOKEN_PROGRAM_ID,
+        TOKEN_PROGRAM_ID,
+        HONEY_MINT,
+        lockedTokens,
+        escrow,
+        this.wallet.publicKey
+      ),
+      await this.program.methods
+        .initEscrowV2()
+        .accounts({
+          payer: this.wallet.publicKey,
           locker,
           escrow,
-          lockedTokens,
           escrowOwner: this.wallet.publicKey,
-          sourceTokens: source,
-          sourceTokensAuthority: this.wallet.publicKey,
-          tokenProgram: TOKEN_PROGRAM_ID
-        },
-        remainingAccounts,
-        preInstructions
+          systemProgram: anchor.web3.SystemProgram.programId
+        })
+        .instruction()
+    ];
+  }
+
+  async unlockEscrowV2(
+    locker: PublicKey,
+    escrow?: PublicKey,
+    destination?: PublicKey
+  ) {
+    if (!escrow) {
+      [escrow] = await this.getEscrowPDA(locker);
+    }
+
+    let preInstructions: anchor.web3.TransactionInstruction[] = [];
+    if (!destination) {
+      destination = await Token.getAssociatedTokenAddress(
+        ASSOCIATED_TOKEN_PROGRAM_ID,
+        TOKEN_PROGRAM_ID,
+        HONEY_MINT,
+        this.wallet.publicKey
+      );
+
+      preInstructions.push(
+        Token.createAssociatedTokenAccountInstruction(
+          ASSOCIATED_TOKEN_PROGRAM_ID,
+          TOKEN_PROGRAM_ID,
+          HONEY_MINT,
+          destination,
+          this.wallet.publicKey,
+          this.wallet.publicKey
+        )
+      );
+    }
+
+    const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
+
+    const txSig = await this.program.methods
+      .exitV2()
+      .accounts({
+        payer: this.wallet.publicKey,
+        locker,
+        escrow,
+        escrowOwner: this.wallet.publicKey,
+        lockedTokens,
+        destinationTokens: destination,
+        tokenProgram: TOKEN_PROGRAM_ID
+      })
+      .preInstructions(preInstructions)
+      .rpc();
+
+    return { txSig, destination };
+  }
+
+  async lockV2(
+    locker: PublicKey,
+    source: PublicKey,
+    amount: anchor.BN,
+    duration: anchor.BN,
+    hasEscrow?: boolean
+  ) {
+    const preInstructions = [];
+    if (!hasEscrow) {
+      preInstructions.push(...(await this.createInitializeEscrowIx(locker)));
+    }
+
+    const remainingAccounts = [
+      {
+        pubkey: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+        isSigner: false,
+        isWritable: false
+      },
+      {
+        pubkey: this.program.programId,
+        isSigner: false,
+        isWritable: false
       }
-    );
+    ];
+
+    const [escrow] = await this.getEscrowPDA(locker);
+    const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
 
+    const txSig = await this.program.methods
+      .lockV2(new anchor.BN(amount), new anchor.BN(duration))
+      .accounts({
+        locker,
+        escrow,
+        lockedTokens,
+        escrowOwner: this.wallet.publicKey,
+        sourceTokens: source,
+        sourceTokensAuthority: this.wallet.publicKey,
+        tokenProgram: TOKEN_PROGRAM_ID
+      })
+      .remainingAccounts(remainingAccounts)
+      .preInstructions(preInstructions)
+      .rpc();
     return { txSig, escrow };
   }
+
   async getEscrowPDA(locker: PublicKey) {
     return anchor.web3.PublicKey.findProgramAddress(
       [
diff --git a/helpers/types/ve_honey.ts b/helpers/types/ve_honey.ts
index 37c4e7e2..9248ea3c 100644
--- a/helpers/types/ve_honey.ts
+++ b/helpers/types/ve_honey.ts
@@ -1,3 +1,5 @@
+import { generateErrorMap } from '@saberhq/anchor-contrib';
+
 export type VeHoney = {
   version: '0.1.0';
   name: 've_honey';
@@ -44,6 +46,29 @@ export type VeHoney = {
         }
       ];
     },
+    {
+      name: 'setLockerParams';
+      accounts: [
+        {
+          name: 'admin';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'locker';
+          isMut: true;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: 'params';
+          type: {
+            defined: 'LockerParams';
+          };
+        }
+      ];
+    },
     {
       name: 'initEscrow';
       accounts: [
@@ -237,230 +262,864 @@ export type VeHoney = {
         }
       ];
       args: [];
-    }
-  ];
-  accounts: [
-    {
-      name: 'escrow';
-      type: {
-        kind: 'struct';
-        fields: [
-          {
-            name: 'locker';
-            type: 'publicKey';
-          },
-          {
-            name: 'owner';
-            type: 'publicKey';
-          },
-          {
-            name: 'bump';
-            type: 'u8';
-          },
-          {
-            name: 'tokens';
-            type: 'publicKey';
-          },
-          {
-            name: 'amount';
-            type: 'u64';
-          },
-          {
-            name: 'escrowStartedAt';
-            type: 'i64';
-          },
-          {
-            name: 'escrowEndsAt';
-            type: 'i64';
-          }
-        ];
-      };
-    },
-    {
-      name: 'locker';
-      type: {
-        kind: 'struct';
-        fields: [
-          {
-            name: 'base';
-            type: 'publicKey';
-          },
-          {
-            name: 'bump';
-            type: 'u8';
-          },
-          {
-            name: 'tokenMint';
-            type: 'publicKey';
-          },
-          {
-            name: 'lockedSupply';
-            type: 'u64';
-          },
-          {
-            name: 'admin';
-            type: 'publicKey';
-          },
-          {
-            name: 'params';
-            type: {
-              defined: 'LockerParams';
-            };
-          }
-        ];
-      };
     },
     {
-      name: 'whitelistEntry';
-      type: {
-        kind: 'struct';
-        fields: [
-          {
-            name: 'locker';
-            type: 'publicKey';
-          },
-          {
-            name: 'bump';
-            type: 'u8';
-          },
-          {
-            name: 'programId';
-            type: 'publicKey';
-          },
-          {
-            name: 'owner';
-            type: 'publicKey';
-          }
-        ];
-      };
-    }
-  ];
-  types: [
-    {
-      name: 'LockerParams';
-      type: {
-        kind: 'struct';
-        fields: [
-          {
-            name: 'minStakeDuration';
-            type: 'u64';
-          },
-          {
-            name: 'maxStakeDuration';
-            type: 'u64';
-          },
-          {
-            name: 'whitelistEnabled';
-            type: 'bool';
-          },
-          {
-            name: 'multiplier';
-            type: 'u8';
-          }
-        ];
-      };
-    }
-  ];
-  events: [
-    {
-      name: 'ExitEscrowEvent';
-      fields: [
+      name: 'migrateLocker';
+      accounts: [
         {
-          name: 'escrowOwner';
-          type: 'publicKey';
-          index: false;
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
         },
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          name: 'base';
+          isMut: false;
+          isSigner: true;
         },
         {
-          name: 'timestamp';
-          type: 'i64';
-          index: false;
+          name: 'locker';
+          isMut: false;
+          isSigner: false;
         },
         {
-          name: 'lockedSupply';
-          type: 'u64';
-          index: false;
+          name: 'newBase';
+          isMut: false;
+          isSigner: true;
         },
         {
-          name: 'releasedAmount';
-          type: 'u64';
-          index: false;
-        }
-      ];
-    },
-    {
-      name: 'InitEscrowEvent';
-      fields: [
-        {
-          name: 'escrow';
-          type: 'publicKey';
-          index: false;
+          name: 'newLocker';
+          isMut: true;
+          isSigner: false;
         },
         {
-          name: 'escrowOwner';
-          type: 'publicKey';
-          index: false;
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
         },
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          name: 'smartWallet';
+          isMut: false;
+          isSigner: false;
         },
         {
-          name: 'timestamp';
-          type: 'i64';
-          index: false;
+          name: 'systemProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: 'proposalActivationMinVotes';
+          type: 'u64';
         }
       ];
     },
     {
-      name: 'InitLockerEvent';
-      fields: [
+      name: 'migrateEscrow';
+      accounts: [
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
         },
         {
-          name: 'tokenMint';
-          type: 'publicKey';
-          index: false;
+          name: 'lockerAdmin';
+          isMut: false;
+          isSigner: true;
         },
         {
-          name: 'admin';
-          type: 'publicKey';
-          index: false;
+          name: 'oldLocker';
+          isMut: false;
+          isSigner: false;
         },
         {
-          name: 'params';
-          type: {
-            defined: 'LockerParams';
-          };
-          index: false;
-        }
-      ];
-    },
-    {
-      name: 'LockEvent';
-      fields: [
-        {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          name: 'newLocker';
+          isMut: false;
+          isSigner: false;
         },
         {
-          name: 'escrowOwner';
-          type: 'publicKey';
-          index: false;
+          name: 'oldEscrow';
+          isMut: true;
+          isSigner: false;
         },
         {
-          name: 'tokenMint';
-          type: 'publicKey';
-          index: false;
+          name: 'newEscrow';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'oldLockedTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'newLockedTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrowOwner';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'systemProgram';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'tokenProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'migrateWhitelist';
+      accounts: [
+        {
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: 'oldLocker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'newLocker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'lockerAdmin';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'whitelistEntry';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'newWhitelistEntry';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'systemProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'initLockerV2';
+      accounts: [
+        {
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: 'base';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'locker';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'tokenMint';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'systemProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: 'params';
+          type: {
+            defined: 'LockerParamsV2';
+          };
+        }
+      ];
+    },
+    {
+      name: 'initEscrowV2';
+      accounts: [
+        {
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: 'locker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'escrow';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrowOwner';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'systemProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'setLockerParamsV2';
+      accounts: [
+        {
+          name: 'locker';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'smartWallet';
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [
+        {
+          name: 'params';
+          type: {
+            defined: 'LockerParamsV2';
+          };
+        }
+      ];
+    },
+    {
+      name: 'approveProgramLockPrivilegeV2';
+      accounts: [
+        {
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: 'locker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'whitelistEntry';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'smartWallet';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'executableId';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'whitelistedOwner';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'systemProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'revokeProgramLockPrivilegeV2';
+      accounts: [
+        {
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: 'locker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'whitelistEntry';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'smartWallet';
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'lockV2';
+      accounts: [
+        {
+          name: 'locker';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrow';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'lockedTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrowOwner';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'sourceTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'sourceTokensAuthority';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'tokenProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: 'amount';
+          type: 'u64';
+        },
+        {
+          name: 'duration';
+          type: 'i64';
+        }
+      ];
+    },
+    {
+      name: 'exitV2';
+      accounts: [
+        {
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: 'locker';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrow';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrowOwner';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'lockedTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'destinationTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'tokenProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'activateProposal';
+      accounts: [
+        {
+          name: 'locker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'proposal';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrow';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'escrowOwner';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'governProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'castVote';
+      accounts: [
+        {
+          name: 'locker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'escrow';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'voteDelegate';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'proposal';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'vote';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'governProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: 'side';
+          type: 'u8';
+        }
+      ];
+    }
+  ];
+  accounts: [
+    {
+      name: 'escrow';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'locker';
+            type: 'publicKey';
+          },
+          {
+            name: 'owner';
+            type: 'publicKey';
+          },
+          {
+            name: 'bump';
+            type: 'u8';
+          },
+          {
+            name: 'tokens';
+            type: 'publicKey';
+          },
+          {
+            name: 'amount';
+            type: 'u64';
+          },
+          {
+            name: 'escrowStartedAt';
+            type: 'i64';
+          },
+          {
+            name: 'escrowEndsAt';
+            type: 'i64';
+          }
+        ];
+      };
+    },
+    {
+      name: 'escrowV2';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'locker';
+            type: 'publicKey';
+          },
+          {
+            name: 'owner';
+            type: 'publicKey';
+          },
+          {
+            name: 'bump';
+            type: 'u8';
+          },
+          {
+            name: 'tokens';
+            type: 'publicKey';
+          },
+          {
+            name: 'amount';
+            type: 'u64';
+          },
+          {
+            name: 'escrowStartedAt';
+            type: 'i64';
+          },
+          {
+            name: 'escrowEndsAt';
+            type: 'i64';
+          },
+          {
+            name: 'voteDelegate';
+            type: 'publicKey';
+          }
+        ];
+      };
+    },
+    {
+      name: 'locker';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'base';
+            type: 'publicKey';
+          },
+          {
+            name: 'bump';
+            type: 'u8';
+          },
+          {
+            name: 'tokenMint';
+            type: 'publicKey';
+          },
+          {
+            name: 'lockedSupply';
+            type: 'u64';
+          },
+          {
+            name: 'admin';
+            type: 'publicKey';
+          },
+          {
+            name: 'params';
+            type: {
+              defined: 'LockerParams';
+            };
+          }
+        ];
+      };
+    },
+    {
+      name: 'lockerV2';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'base';
+            type: 'publicKey';
+          },
+          {
+            name: 'bump';
+            type: 'u8';
+          },
+          {
+            name: 'tokenMint';
+            type: 'publicKey';
+          },
+          {
+            name: 'lockedSupply';
+            type: 'u64';
+          },
+          {
+            name: 'governor';
+            type: 'publicKey';
+          },
+          {
+            name: 'params';
+            type: {
+              defined: 'LockerParamsV2';
+            };
+          }
+        ];
+      };
+    },
+    {
+      name: 'whitelistEntry';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'locker';
+            type: 'publicKey';
+          },
+          {
+            name: 'bump';
+            type: 'u8';
+          },
+          {
+            name: 'programId';
+            type: 'publicKey';
+          },
+          {
+            name: 'owner';
+            type: 'publicKey';
+          }
+        ];
+      };
+    }
+  ];
+  types: [
+    {
+      name: 'LockerParams';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'minStakeDuration';
+            type: 'u64';
+          },
+          {
+            name: 'maxStakeDuration';
+            type: 'u64';
+          },
+          {
+            name: 'whitelistEnabled';
+            type: 'bool';
+          },
+          {
+            name: 'multiplier';
+            type: 'u8';
+          }
+        ];
+      };
+    },
+    {
+      name: 'LockerParamsV2';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'minStakeDuration';
+            type: 'u64';
+          },
+          {
+            name: 'maxStakeDuration';
+            type: 'u64';
+          },
+          {
+            name: 'proposalActivationMinVotes';
+            type: 'u64';
+          },
+          {
+            name: 'whitelistEnabled';
+            type: 'bool';
+          },
+          {
+            name: 'multiplier';
+            type: 'u8';
+          }
+        ];
+      };
+    }
+  ];
+  events: [
+    {
+      name: 'ExitEscrowEvent';
+      fields: [
+        {
+          name: 'escrowOwner';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'timestamp';
+          type: 'i64';
+          index: false;
+        },
+        {
+          name: 'lockedSupply';
+          type: 'u64';
+          index: false;
+        },
+        {
+          name: 'releasedAmount';
+          type: 'u64';
+          index: false;
+        }
+      ];
+    },
+    {
+      name: 'InitEscrowEvent';
+      fields: [
+        {
+          name: 'escrow';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'escrowOwner';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'timestamp';
+          type: 'i64';
+          index: false;
+        }
+      ];
+    },
+    {
+      name: 'InitLockerEvent';
+      fields: [
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'tokenMint';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'admin';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'params';
+          type: {
+            defined: 'LockerParams';
+          };
+          index: false;
+        }
+      ];
+    },
+    {
+      name: 'InitLockerV2Event';
+      fields: [
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'tokenMint';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'governor';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'params';
+          type: {
+            defined: 'LockerParamsV2';
+          };
+          index: false;
+        }
+      ];
+    },
+    {
+      name: 'LockEvent';
+      fields: [
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'escrowOwner';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'tokenMint';
+          type: 'publicKey';
+          index: false;
         },
         {
           name: 'amount';
@@ -468,148 +1127,580 @@ export type VeHoney = {
           index: false;
         },
         {
-          name: 'lockerSupply';
-          type: 'u64';
-          index: false;
+          name: 'lockerSupply';
+          type: 'u64';
+          index: false;
+        },
+        {
+          name: 'duration';
+          type: 'i64';
+          index: false;
+        },
+        {
+          name: 'prevEscrowEndsAt';
+          type: 'i64';
+          index: false;
+        },
+        {
+          name: 'nextEscrowEndsAt';
+          type: 'i64';
+          index: false;
+        },
+        {
+          name: 'nextEscrowStartedAt';
+          type: 'i64';
+          index: false;
+        }
+      ];
+    },
+    {
+      name: 'ApproveLockPrivilegeEvent';
+      fields: [
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'programId';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'owner';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'timestamp';
+          type: 'i64';
+          index: false;
+        }
+      ];
+    },
+    {
+      name: 'RevokeLockPrivilegeEvent';
+      fields: [
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'programId';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'timestamp';
+          type: 'i64';
+          index: false;
+        }
+      ];
+    }
+  ];
+  errors: [
+    {
+      code: 6000;
+      name: 'EscrowNotEnded';
+      msg: 'Escrow has not ended.';
+    },
+    {
+      code: 6001;
+      name: 'InvalidLockerAdmin';
+      msg: 'Invalid locker admin';
+    },
+    {
+      code: 6002;
+      name: 'LockupDurationTooShort';
+      msg: 'Lockup duration must at least be the min stake duration.';
+    },
+    {
+      code: 6003;
+      name: 'LockupDurationTooLong';
+      msg: 'Lockup duration must at most be the max stake duration.';
+    },
+    {
+      code: 6004;
+      name: 'RefreshCannotShorten';
+      msg: 'A voting escrow refresh cannot shorten the escrow time remaining.';
+    },
+    {
+      code: 6005;
+      name: 'MustProvideWhitelist';
+      msg: 'Program whitelist enabled; please provide whitelist entry and instructions sysvar';
+    },
+    {
+      code: 6006;
+      name: 'ProgramNotWhitelisted';
+      msg: 'CPI caller not whitelisted to invoke lock instruction.';
+    },
+    {
+      code: 6007;
+      name: 'EscrowOwnerNotWhitelisted';
+      msg: 'CPI caller not whitelisted for escrow owner to invoke lock instruction.';
+    },
+    {
+      code: 6008;
+      name: 'EscrowExpired';
+      msg: 'Escrow was already expired.';
+    },
+    {
+      code: 6009;
+      name: 'LockedSupplyMismatch';
+      msg: 'Token lock failed, locked supply mismatches the exact amount.';
+    },
+    {
+      code: 6010;
+      name: 'EscrowInUse';
+      msg: 'The escrow has already locked.';
+    },
+    {
+      code: 6011;
+      name: 'EscrowNoBalance';
+      msg: "The escrow doesn't have balance";
+    },
+    {
+      code: 6012;
+      name: 'ProposalMustBeActive';
+      msg: 'The proposal must be active';
+    },
+    {
+      code: 6013;
+      name: 'GovernorMismatch';
+      msg: 'Governor mismatch';
+    },
+    {
+      code: 6014;
+      name: 'ProgramIdMustBeExecutable';
+      msg: 'Program id must be executable';
+    },
+    {
+      code: 6015;
+      name: 'InsufficientVotingPower';
+      msg: 'Insufficient voting power to activate a proposal';
+    }
+  ];
+};
+
+export const IDL: VeHoney = {
+  version: '0.1.0',
+  name: 've_honey',
+  instructions: [
+    {
+      name: 'initLocker',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'base',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'tokenMint',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'systemProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: [
+        {
+          name: 'admin',
+          type: 'publicKey'
+        },
+        {
+          name: 'params',
+          type: {
+            defined: 'LockerParams'
+          }
+        }
+      ]
+    },
+    {
+      name: 'setLockerParams',
+      accounts: [
+        {
+          name: 'admin',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: true,
+          isSigner: false
+        }
+      ],
+      args: [
+        {
+          name: 'params',
+          type: {
+            defined: 'LockerParams'
+          }
+        }
+      ]
+    },
+    {
+      name: 'initEscrow',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrow',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrowOwner',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'systemProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: []
+    },
+    {
+      name: 'approveProgramLockPrivilege',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'lockerAdmin',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'whitelistEntry',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'executableId',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'whitelistedOwner',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'systemProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: []
+    },
+    {
+      name: 'revokeProgramLockPrivilege',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'lockerAdmin',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'whitelistEntry',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'executableId',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: []
+    },
+    {
+      name: 'lock',
+      accounts: [
+        {
+          name: 'locker',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrow',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'lockedTokens',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrowOwner',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'sourceTokens',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'sourceTokensAuthority',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'tokenProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: [
+        {
+          name: 'amount',
+          type: 'u64'
+        },
+        {
+          name: 'duration',
+          type: 'i64'
+        }
+      ]
+    },
+    {
+      name: 'exit',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: true,
+          isSigner: false
         },
         {
-          name: 'duration';
-          type: 'i64';
-          index: false;
+          name: 'escrow',
+          isMut: true,
+          isSigner: false
         },
         {
-          name: 'prevEscrowEndsAt';
-          type: 'i64';
-          index: false;
+          name: 'escrowOwner',
+          isMut: false,
+          isSigner: true
         },
         {
-          name: 'nextEscrowEndsAt';
-          type: 'i64';
-          index: false;
+          name: 'lockedTokens',
+          isMut: true,
+          isSigner: false
         },
         {
-          name: 'nextEscrowStartedAt';
-          type: 'i64';
-          index: false;
+          name: 'destinationTokens',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'tokenProgram',
+          isMut: false,
+          isSigner: false
         }
-      ];
+      ],
+      args: []
     },
     {
-      name: 'ApproveLockPrivilegeEvent';
-      fields: [
+      name: 'migrateLocker',
+      accounts: [
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          name: 'payer',
+          isMut: true,
+          isSigner: true
         },
         {
-          name: 'programId';
-          type: 'publicKey';
-          index: false;
+          name: 'base',
+          isMut: false,
+          isSigner: true
         },
         {
-          name: 'owner';
-          type: 'publicKey';
-          index: false;
+          name: 'locker',
+          isMut: false,
+          isSigner: false
         },
         {
-          name: 'timestamp';
-          type: 'i64';
-          index: false;
+          name: 'newBase',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'newLocker',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'governor',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'smartWallet',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'systemProgram',
+          isMut: false,
+          isSigner: false
         }
-      ];
+      ],
+      args: [
+        {
+          name: 'proposalActivationMinVotes',
+          type: 'u64'
+        }
+      ]
     },
     {
-      name: 'RevokeLockPrivilegeEvent';
-      fields: [
+      name: 'migrateEscrow',
+      accounts: [
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          name: 'payer',
+          isMut: true,
+          isSigner: true
         },
         {
-          name: 'programId';
-          type: 'publicKey';
-          index: false;
+          name: 'lockerAdmin',
+          isMut: false,
+          isSigner: true
         },
         {
-          name: 'timestamp';
-          type: 'i64';
-          index: false;
+          name: 'oldLocker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'newLocker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'oldEscrow',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'newEscrow',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'oldLockedTokens',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'newLockedTokens',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrowOwner',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'systemProgram',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'tokenProgram',
+          isMut: false,
+          isSigner: false
         }
-      ];
-    }
-  ];
-  errors: [
-    {
-      code: 6000;
-      name: 'EscrowNotEnded';
-      msg: 'Escrow has not ended.';
-    },
-    {
-      code: 6001;
-      name: 'InvalidLockerAdmin';
-      msg: 'Invalid locker admin';
-    },
-    {
-      code: 6002;
-      name: 'LockupDurationTooShort';
-      msg: 'Lockup duration must at least be the min stake duration.';
-    },
-    {
-      code: 6003;
-      name: 'LockupDurationTooLong';
-      msg: 'Lockup duration must at most be the max stake duration.';
-    },
-    {
-      code: 6004;
-      name: 'RefreshCannotShorten';
-      msg: 'A voting escrow refresh cannot shorten the escrow time remaining.';
-    },
-    {
-      code: 6005;
-      name: 'MustProvideWhitelist';
-      msg: 'Program whitelist enabled; please provide whitelist entry and instructions sysvar';
-    },
-    {
-      code: 6006;
-      name: 'ProgramNotWhitelisted';
-      msg: 'CPI caller not whitelisted to invoke lock instruction.';
-    },
-    {
-      code: 6007;
-      name: 'EscrowOwnerNotWhitelisted';
-      msg: 'CPI caller not whitelisted for escrow owner to invoke lock instruction.';
-    },
-    {
-      code: 6008;
-      name: 'EscrowExpired';
-      msg: 'Escrow was already expired.';
-    },
-    {
-      code: 6009;
-      name: 'LockedSupplyMismatch';
-      msg: 'Token lock failed, locked supply mismatches the exact amount.';
+      ],
+      args: []
     },
     {
-      code: 6010;
-      name: 'EscrowInUse';
-      msg: 'The escrow has already locked.';
+      name: 'migrateWhitelist',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'oldLocker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'newLocker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'lockerAdmin',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'whitelistEntry',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'newWhitelistEntry',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'systemProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: []
     },
     {
-      code: 6011;
-      name: 'EscrowNoBalance';
-      msg: "The escrow doesn't have balance";
-    }
-  ];
-};
-
-export const IDL: VeHoney = {
-  version: '0.1.0',
-  name: 've_honey',
-  instructions: [
-    {
-      name: 'initLocker',
+      name: 'initLockerV2',
       accounts: [
         {
           name: 'payer',
@@ -627,7 +1718,12 @@ export const IDL: VeHoney = {
           isSigner: false
         },
         {
-          name: 'tokenMint',
+          name: 'tokenMint',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'governor',
           isMut: false,
           isSigner: false
         },
@@ -638,20 +1734,16 @@ export const IDL: VeHoney = {
         }
       ],
       args: [
-        {
-          name: 'admin',
-          type: 'publicKey'
-        },
         {
           name: 'params',
           type: {
-            defined: 'LockerParams'
+            defined: 'LockerParamsV2'
           }
         }
       ]
     },
     {
-      name: 'initEscrow',
+      name: 'initEscrowV2',
       accounts: [
         {
           name: 'payer',
@@ -660,7 +1752,7 @@ export const IDL: VeHoney = {
         },
         {
           name: 'locker',
-          isMut: true,
+          isMut: false,
           isSigner: false
         },
         {
@@ -682,28 +1774,61 @@ export const IDL: VeHoney = {
       args: []
     },
     {
-      name: 'approveProgramLockPrivilege',
+      name: 'setLockerParamsV2',
       accounts: [
         {
-          name: 'payer',
+          name: 'locker',
           isMut: true,
-          isSigner: true
+          isSigner: false
         },
         {
-          name: 'locker',
+          name: 'governor',
           isMut: false,
           isSigner: false
         },
         {
-          name: 'lockerAdmin',
+          name: 'smartWallet',
           isMut: false,
           isSigner: true
+        }
+      ],
+      args: [
+        {
+          name: 'params',
+          type: {
+            defined: 'LockerParamsV2'
+          }
+        }
+      ]
+    },
+    {
+      name: 'approveProgramLockPrivilegeV2',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: false,
+          isSigner: false
         },
         {
           name: 'whitelistEntry',
           isMut: true,
           isSigner: false
         },
+        {
+          name: 'governor',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'smartWallet',
+          isMut: false,
+          isSigner: true
+        },
         {
           name: 'executableId',
           isMut: false,
@@ -723,7 +1848,7 @@ export const IDL: VeHoney = {
       args: []
     },
     {
-      name: 'revokeProgramLockPrivilege',
+      name: 'revokeProgramLockPrivilegeV2',
       accounts: [
         {
           name: 'payer',
@@ -735,26 +1860,26 @@ export const IDL: VeHoney = {
           isMut: false,
           isSigner: false
         },
-        {
-          name: 'lockerAdmin',
-          isMut: false,
-          isSigner: true
-        },
         {
           name: 'whitelistEntry',
           isMut: true,
           isSigner: false
         },
         {
-          name: 'executableId',
+          name: 'governor',
           isMut: false,
           isSigner: false
+        },
+        {
+          name: 'smartWallet',
+          isMut: false,
+          isSigner: true
         }
       ],
       args: []
     },
     {
-      name: 'lock',
+      name: 'lockV2',
       accounts: [
         {
           name: 'locker',
@@ -804,7 +1929,7 @@ export const IDL: VeHoney = {
       ]
     },
     {
-      name: 'exit',
+      name: 'exitV2',
       accounts: [
         {
           name: 'payer',
@@ -843,6 +1968,88 @@ export const IDL: VeHoney = {
         }
       ],
       args: []
+    },
+    {
+      name: 'activateProposal',
+      accounts: [
+        {
+          name: 'locker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'governor',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'proposal',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrow',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'escrowOwner',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'governProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: []
+    },
+    {
+      name: 'castVote',
+      accounts: [
+        {
+          name: 'locker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'escrow',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'voteDelegate',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'proposal',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'vote',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'governor',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'governProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: [
+        {
+          name: 'side',
+          type: 'u8'
+        }
+      ]
     }
   ],
   accounts: [
@@ -882,6 +2089,46 @@ export const IDL: VeHoney = {
         ]
       }
     },
+    {
+      name: 'escrowV2',
+      type: {
+        kind: 'struct',
+        fields: [
+          {
+            name: 'locker',
+            type: 'publicKey'
+          },
+          {
+            name: 'owner',
+            type: 'publicKey'
+          },
+          {
+            name: 'bump',
+            type: 'u8'
+          },
+          {
+            name: 'tokens',
+            type: 'publicKey'
+          },
+          {
+            name: 'amount',
+            type: 'u64'
+          },
+          {
+            name: 'escrowStartedAt',
+            type: 'i64'
+          },
+          {
+            name: 'escrowEndsAt',
+            type: 'i64'
+          },
+          {
+            name: 'voteDelegate',
+            type: 'publicKey'
+          }
+        ]
+      }
+    },
     {
       name: 'locker',
       type: {
@@ -916,6 +2163,40 @@ export const IDL: VeHoney = {
         ]
       }
     },
+    {
+      name: 'lockerV2',
+      type: {
+        kind: 'struct',
+        fields: [
+          {
+            name: 'base',
+            type: 'publicKey'
+          },
+          {
+            name: 'bump',
+            type: 'u8'
+          },
+          {
+            name: 'tokenMint',
+            type: 'publicKey'
+          },
+          {
+            name: 'lockedSupply',
+            type: 'u64'
+          },
+          {
+            name: 'governor',
+            type: 'publicKey'
+          },
+          {
+            name: 'params',
+            type: {
+              defined: 'LockerParamsV2'
+            }
+          }
+        ]
+      }
+    },
     {
       name: 'whitelistEntry',
       type: {
@@ -965,6 +2246,34 @@ export const IDL: VeHoney = {
           }
         ]
       }
+    },
+    {
+      name: 'LockerParamsV2',
+      type: {
+        kind: 'struct',
+        fields: [
+          {
+            name: 'minStakeDuration',
+            type: 'u64'
+          },
+          {
+            name: 'maxStakeDuration',
+            type: 'u64'
+          },
+          {
+            name: 'proposalActivationMinVotes',
+            type: 'u64'
+          },
+          {
+            name: 'whitelistEnabled',
+            type: 'bool'
+          },
+          {
+            name: 'multiplier',
+            type: 'u8'
+          }
+        ]
+      }
     }
   ],
   events: [
@@ -1050,6 +2359,33 @@ export const IDL: VeHoney = {
         }
       ]
     },
+    {
+      name: 'InitLockerV2Event',
+      fields: [
+        {
+          name: 'locker',
+          type: 'publicKey',
+          index: false
+        },
+        {
+          name: 'tokenMint',
+          type: 'publicKey',
+          index: false
+        },
+        {
+          name: 'governor',
+          type: 'publicKey',
+          index: false
+        },
+        {
+          name: 'params',
+          type: {
+            defined: 'LockerParamsV2'
+          },
+          index: false
+        }
+      ]
+    },
     {
       name: 'LockEvent',
       fields: [
@@ -1206,6 +2542,28 @@ export const IDL: VeHoney = {
       code: 6011,
       name: 'EscrowNoBalance',
       msg: "The escrow doesn't have balance"
+    },
+    {
+      code: 6012,
+      name: 'ProposalMustBeActive',
+      msg: 'The proposal must be active'
+    },
+    {
+      code: 6013,
+      name: 'GovernorMismatch',
+      msg: 'Governor mismatch'
+    },
+    {
+      code: 6014,
+      name: 'ProgramIdMustBeExecutable',
+      msg: 'Program id must be executable'
+    },
+    {
+      code: 6015,
+      name: 'InsufficientVotingPower',
+      msg: 'Insufficient voting power to activate a proposal'
     }
   ]
 };
+
+export const LockedVoterErrors = generateErrorMap(IDL);
diff --git a/helpers/utils.ts b/helpers/utils.ts
index 9f337b5e..78440cd7 100644
--- a/helpers/utils.ts
+++ b/helpers/utils.ts
@@ -1,6 +1,23 @@
 import { programs } from '@metaplex/js';
-import { Connection, PublicKey } from '@solana/web3.js';
+import {
+  BPF_LOADER_DEPRECATED_PROGRAM_ID,
+  BPF_LOADER_PROGRAM_ID,
+  Connection,
+  PublicKey,
+  Secp256k1Program,
+  StakeProgram,
+  SystemProgram,
+  SYSVAR_CLOCK_PUBKEY,
+  SYSVAR_RENT_PUBKEY,
+  SYSVAR_REWARDS_PUBKEY,
+  SYSVAR_STAKE_HISTORY_PUBKEY,
+  Transaction,
+  VOTE_PROGRAM_ID
+} from '@solana/web3.js';
 import * as anchor from '@project-serum/anchor';
+import type { Network } from '@saberhq/solana-contrib';
+import type { Cluster, TransactionInstruction } from '@solana/web3.js';
+import { TokenInfo } from '@saberhq/token-utils';
 
 export const convertArrayToObject = (array: any[], key: string) => {
   const initialValue = {};
@@ -92,3 +109,265 @@ export const convertToBN = (
 
   return new anchor.BN(amount).mul(wads).add(new anchor.BN(mod));
 };
+
+export const serializeToBase64 = (tx: Transaction): string =>
+  tx
+    .serialize({
+      requireAllSignatures: false,
+      verifySignatures: false
+    })
+    .toString('base64');
+
+export const makeTransaction = (
+  network: Network,
+  ixs: TransactionInstruction[]
+): Transaction => {
+  const tx = new Transaction();
+  tx.recentBlockhash = 'GfVcyD4kkTrj4bKc7WA9sZCin9JDbdT4Zkd3EittNR1W';
+  tx.feePayer =
+    network === 'devnet'
+      ? new PublicKey('A2jaCHPzD6346348JoEym2KFGX9A7uRBw6AhCdX7gTWP')
+      : new PublicKey('9u9iZBWqGsp5hXBxkVZtBTuLSGNAG9gEQLgpuVw39ASg');
+  tx.instructions = ixs;
+  return tx;
+};
+
+/**
+ * Generates a link for inspecting the contents of a transaction.
+ *
+ * @returns URL
+ */
+export const generateInspectLink = (
+  cluster: Cluster,
+  tx: Transaction
+): string => {
+  return `https://anchor.so/tx/inspector?cluster=${cluster}&message=${encodeURIComponent(
+    serializeToBase64(tx)
+  )}`;
+};
+
+export enum PROGRAM_NAMES {
+  // native built-ins
+  ADDRESS_MAP = 'Address Map Program',
+  CONFIG = 'Config Program',
+  STAKE = 'Stake Program',
+  SYSTEM = 'System Program',
+  VOTE = 'Vote Program',
+  SECP256K1 = 'Secp256k1 Program',
+
+  // spl
+  ASSOCIATED_TOKEN = 'Associated Token Program',
+  FEATURE_PROPOSAL = 'Feature Proposal Program',
+  LENDING = 'Lending Program',
+  MEMO = 'Memo Program',
+  MEMO_2 = 'Memo Program v2',
+  NAME = 'Name Service Program',
+  STAKE_POOL = 'Stake Pool Program',
+  SWAP = 'Swap Program',
+  TOKEN = 'Token Program',
+  TOKEN_METADATA = 'Token Metadata Program',
+  TOKEN_VAULT = 'Token Vault Program',
+
+  // other
+  ACUMEN = 'Acumen Program',
+  BONFIDA_POOL = 'Bonfida Pool Program',
+  BREAK_SOLANA = 'Break Solana Program',
+  MANGO_GOVERNANCE = 'Mango Governance Program',
+  MANGO_ICO = 'Mango ICO Program',
+  MANGO_1 = 'Mango Program v1',
+  MANGO_2 = 'Mango Program v2',
+  MANGO_3 = 'Mango Program v3',
+  MARINADE = 'Marinade Staking Program',
+  MERCURIAL = 'Mercurial Stable Swap Program',
+  METAPLEX = 'Metaplex Program',
+  NFT_AUCTION = 'NFT Auction Program',
+  NFT_CANDY_MACHINE = 'NFT Candy Machine Program',
+  ORCA_SWAP_1 = 'Orca Swap Program v1',
+  ORCA_SWAP_2 = 'Orca Swap Program v2',
+  ORCA_AQUAFARM = 'Orca Aquafarm Program',
+  PORT = 'Port Finance Program',
+  PYTH = 'Pyth Oracle Program',
+  QUARRY_MERGE_MINE = 'Quarry Merge Mine',
+  QUARRY_MINE = 'Quarry Mine',
+  QUARRY_MINT_WRAPPER = 'Quarry Mint Wrapper',
+  QUARRY_REDEEMER = 'Quarry Redeemer',
+  QUARRY_REGISTRY = 'Quarry Registry',
+  RAYDIUM_AMM = 'Raydium AMM Program',
+  RAYDIUM_IDO = 'Raydium IDO Program',
+  RAYDIUM_LP_1 = 'Raydium Liquidity Pool Program v1',
+  RAYDIUM_LP_2 = 'Raydium Liquidity Pool Program v2',
+  RAYDIUM_STAKING = 'Raydium Staking Program',
+  SABER_ROUTER = 'Saber Router Program',
+  SABER_SWAP = 'Saber Stable Swap Program',
+  SERUM_1 = 'Serum Dex Program v1',
+  SERUM_2 = 'Serum Dex Program v2',
+  SERUM_3 = 'Serum Dex Program v3',
+  SERUM_SWAP = 'Serum Swap Program',
+  SOLEND = 'Solend Program',
+  SOLIDO = 'Lido for Solana Program',
+  STEP_SWAP = 'Step Finance Swap Program',
+  SWITCHBOARD = 'Switchboard Oracle Program',
+  WORMHOLE = 'Wormhole'
+}
+
+export const KNOWN_NON_ANCHOR_PROGRAMS = new Set(
+  Object.keys({
+    // native built-ins
+    AddressMap111111111111111111111111111111111: PROGRAM_NAMES.ADDRESS_MAP,
+    Config1111111111111111111111111111111111111: PROGRAM_NAMES.CONFIG,
+    [StakeProgram.programId.toBase58()]: PROGRAM_NAMES.STAKE,
+    [SystemProgram.programId.toBase58()]: PROGRAM_NAMES.SYSTEM,
+    [VOTE_PROGRAM_ID.toBase58()]: PROGRAM_NAMES.VOTE,
+    [Secp256k1Program.programId.toBase58()]: PROGRAM_NAMES.SECP256K1,
+
+    // spl
+    ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL:
+      PROGRAM_NAMES.ASSOCIATED_TOKEN,
+    Feat1YXHhH6t1juaWF74WLcfv4XoNocjXA6sPWHNgAse:
+      PROGRAM_NAMES.FEATURE_PROPOSAL,
+    LendZqTs7gn5CTSJU1jWKhKuVpjJGom45nnwPb2AMTi: PROGRAM_NAMES.LENDING,
+    Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo: PROGRAM_NAMES.MEMO,
+    MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr: PROGRAM_NAMES.MEMO_2,
+    namesLPneVptA9Z5rqUDD9tMTWEJwofgaYwp8cawRkX: PROGRAM_NAMES.NAME,
+    SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy: PROGRAM_NAMES.STAKE_POOL,
+    SwaPpA9LAaLfeLi3a68M4DjnLqgtticKg6CnyNwgAC8: PROGRAM_NAMES.SWAP,
+    TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA: PROGRAM_NAMES.TOKEN
+  })
+);
+export const PROGRAM_NAME_BY_ID = {
+  // native built-ins
+  AddressMap111111111111111111111111111111111: PROGRAM_NAMES.ADDRESS_MAP,
+  Config1111111111111111111111111111111111111: PROGRAM_NAMES.CONFIG,
+  [StakeProgram.programId.toBase58()]: PROGRAM_NAMES.STAKE,
+  [SystemProgram.programId.toBase58()]: PROGRAM_NAMES.SYSTEM,
+  [VOTE_PROGRAM_ID.toBase58()]: PROGRAM_NAMES.VOTE,
+  [Secp256k1Program.programId.toBase58()]: PROGRAM_NAMES.SECP256K1,
+
+  // spl
+  ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL: PROGRAM_NAMES.ASSOCIATED_TOKEN,
+  Feat1YXHhH6t1juaWF74WLcfv4XoNocjXA6sPWHNgAse: PROGRAM_NAMES.FEATURE_PROPOSAL,
+  LendZqTs7gn5CTSJU1jWKhKuVpjJGom45nnwPb2AMTi: PROGRAM_NAMES.LENDING,
+  Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo: PROGRAM_NAMES.MEMO,
+  MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr: PROGRAM_NAMES.MEMO_2,
+  namesLPneVptA9Z5rqUDD9tMTWEJwofgaYwp8cawRkX: PROGRAM_NAMES.NAME,
+  SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy: PROGRAM_NAMES.STAKE_POOL,
+  SwaPpA9LAaLfeLi3a68M4DjnLqgtticKg6CnyNwgAC8: PROGRAM_NAMES.SWAP,
+  TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA: PROGRAM_NAMES.TOKEN,
+  metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s: PROGRAM_NAMES.TOKEN_METADATA,
+  vau1zxA2LbssAUEF7Gpw91zMM1LvXrvpzJtmZ58rPsn: PROGRAM_NAMES.TOKEN_VAULT,
+
+  // other
+  C64kTdg1Hzv5KoQmZrQRcm2Qz7PkxtFBgw7EpFhvYn8W: PROGRAM_NAMES.ACUMEN,
+  WvmTNLpGMVbwJVYztYL4Hnsy82cJhQorxjnnXcRm3b6: PROGRAM_NAMES.BONFIDA_POOL,
+  BrEAK7zGZ6dM71zUDACDqJnekihmwF15noTddWTsknjC: PROGRAM_NAMES.BREAK_SOLANA,
+  GqTPL6qRf5aUuqscLh8Rg2HTxPUXfhhAXDptTLhp1t2J: PROGRAM_NAMES.MANGO_GOVERNANCE,
+  '7sPptkymzvayoSbLXzBsXEF8TSf3typNnAWkrKrDizNb': PROGRAM_NAMES.MANGO_ICO,
+  JD3bq9hGdy38PuWQ4h2YJpELmHVGPPfFSuFkpzAd9zfu: PROGRAM_NAMES.MANGO_1,
+  '5fNfvyp5czQVX77yoACa3JJVEhdRaWjPuazuWgjhTqEH': PROGRAM_NAMES.MANGO_2,
+  mv3ekLzLbnVPNxjSKvqBpU3ZeZXPQdEC3bp5MDEBG68: PROGRAM_NAMES.MANGO_3,
+  MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD: PROGRAM_NAMES.MARINADE,
+  MERLuDFBMmsHnsBPZw2sDQZHvXFMwp8EdjudcU2HKky: PROGRAM_NAMES.MERCURIAL,
+  p1exdMJcjVao65QdewkaZRUnU6VPSXhus9n2GzWfh98: PROGRAM_NAMES.METAPLEX,
+  auctxRXPeJoc4817jDhf4HbjnhEcr1cCXenosMhK5R8: PROGRAM_NAMES.NFT_AUCTION,
+  cndyAnrLdpjq1Ssp1z8xxDsB8dxe7u4HL5Nxi2K5WXZ: PROGRAM_NAMES.NFT_CANDY_MACHINE,
+  DjVE6JNiYqPL2QXyCUUh8rNjHrbz9hXHNYt99MQ59qw1: PROGRAM_NAMES.ORCA_SWAP_1,
+  '9W959DqEETiGZocYWCQPaJ6sBmUzgfxXfqGeTEdp3aQP': PROGRAM_NAMES.ORCA_SWAP_2,
+  '82yxjeMsvaURa4MbZZ7WZZHfobirZYkH1zF8fmeGtyaQ': PROGRAM_NAMES.ORCA_AQUAFARM,
+  Port7uDYB3wk6GJAw4KT1WpTeMtSu9bTcChBHkX2LfR: PROGRAM_NAMES.PORT,
+  FsJ3A3u2vn5cTVofAjvy6y5kwABJAqYWpe4975bi2epH: PROGRAM_NAMES.PYTH,
+  QMMD16kjauP5knBwxNUJRZ1Z5o3deBuFrqVjBVmmqto: PROGRAM_NAMES.QUARRY_MERGE_MINE,
+  QMNeHCGYnLVDn1icRAfQZpjPLBNkfGbSKRB83G5d8KB: PROGRAM_NAMES.QUARRY_MINE,
+  QMWoBmAyJLAsA1Lh9ugMTw2gciTihncciphzdNzdZYV:
+    PROGRAM_NAMES.QUARRY_MINT_WRAPPER,
+  QRDxhMw1P2NEfiw5mYXG79bwfgHTdasY2xNP76XSea9: PROGRAM_NAMES.QUARRY_REDEEMER,
+  QREGBnEj9Sa5uR91AV8u3FxThgP5ZCvdZUW2bHAkfNc: PROGRAM_NAMES.QUARRY_REGISTRY,
+  '675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8': PROGRAM_NAMES.RAYDIUM_AMM,
+  '9HzJyW1qZsEiSfMUf6L2jo3CcTKAyBmSyKdwQeYisHrC': PROGRAM_NAMES.RAYDIUM_IDO,
+  RVKd61ztZW9GUwhRbbLoYVRE5Xf1B2tVscKqwZqXgEr: PROGRAM_NAMES.RAYDIUM_LP_1,
+  '27haf8L6oxUeXrHrgEgsexjSY5hbVUWEmvv9Nyxg8vQv': PROGRAM_NAMES.RAYDIUM_LP_2,
+  EhhTKczWMGQt46ynNeRX1WfeagwwJd7ufHvCDjRxjo5Q: PROGRAM_NAMES.RAYDIUM_STAKING,
+  Crt7UoUR6QgrFrN7j8rmSQpUTNWNSitSwWvsWGf1qZ5t: PROGRAM_NAMES.SABER_ROUTER,
+  SSwpkEEcbUqx4vtoEByFjSkhKdCT862DNVb52nZg1UZ: PROGRAM_NAMES.SABER_SWAP,
+  BJ3jrUzddfuSrZHXSCxMUUQsjKEyLmuuyZebkcaFp2fg: PROGRAM_NAMES.SERUM_1,
+  EUqojwWA2rd19FZrzeBncJsm38Jm1hEhE3zsmX3bRc2o: PROGRAM_NAMES.SERUM_2,
+  '9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin': PROGRAM_NAMES.SERUM_3,
+  '22Y43yTVxuUkoRKdm9thyRhQ3SdgQS7c7kB6UNCiaczD': PROGRAM_NAMES.SERUM_SWAP,
+  So1endDq2YkqhipRh3WViPa8hdiSpxWy6z3Z6tMCpAo: PROGRAM_NAMES.SOLEND,
+  CrX7kMhLC3cSsXJdT7JDgqrRVWGnUpX3gfEfxxU2NVLi: PROGRAM_NAMES.SOLIDO,
+  SSwpMgqNDsyV7mAgN9ady4bDVu5ySjmmXejXvy2vLt1: PROGRAM_NAMES.STEP_SWAP,
+  DtmE9D2CSB4L5D6A15mraeEjrGMm6auWVzgaD8hK2tZM: PROGRAM_NAMES.SWITCHBOARD,
+  WormT3McKhFJ2RkiGpdw9GKvNCrB2aB54gb2uV9MfQC: PROGRAM_NAMES.WORMHOLE
+} as const;
+
+export type LoaderName = typeof LOADER_IDS[keyof typeof LOADER_IDS];
+export const LOADER_IDS = {
+  MoveLdr111111111111111111111111111111111111: 'Move Loader',
+  NativeLoader1111111111111111111111111111111: 'Native Loader',
+  [BPF_LOADER_DEPRECATED_PROGRAM_ID.toBase58()]: 'BPF Loader',
+  [BPF_LOADER_PROGRAM_ID.toBase58()]: 'BPF Loader 2',
+  BPFLoaderUpgradeab1e11111111111111111111111: 'BPF Upgradeable Loader'
+} as const;
+
+export function programLabel(address: string): string | undefined {
+  const programName = PROGRAM_NAME_BY_ID[address];
+  return programName ?? LOADER_IDS[address];
+}
+
+export const SYSVAR_IDS = {
+  [SYSVAR_CLOCK_PUBKEY.toBase58()]: 'Sysvar: Clock',
+  SysvarEpochSchedu1e111111111111111111111111: 'Sysvar: Epoch Schedule',
+  SysvarFees111111111111111111111111111111111: 'Sysvar: Fees',
+  SysvarRecentB1ockHashes11111111111111111111: 'Sysvar: Recent Blockhashes',
+  [SYSVAR_RENT_PUBKEY.toBase58()]: 'Sysvar: Rent',
+  [SYSVAR_REWARDS_PUBKEY.toBase58()]: 'Sysvar: Rewards',
+  SysvarS1otHashes111111111111111111111111111: 'Sysvar: Slot Hashes',
+  SysvarS1otHistory11111111111111111111111111: 'Sysvar: Slot History',
+  [SYSVAR_STAKE_HISTORY_PUBKEY.toBase58()]: 'Sysvar: Stake History',
+  Sysvar1nstructions1111111111111111111111111: 'Sysvar: Instructions'
+};
+
+export const SPECIAL_IDS: { [key: string]: string } = {
+  '1nc1nerator11111111111111111111111111111111': 'Incinerator',
+  Sysvar1111111111111111111111111111111111111: 'SYSVAR'
+};
+
+export function tokenLabel(
+  address: string,
+  tokenRegistry?: Map<string, TokenInfo>
+): string | undefined {
+  if (!tokenRegistry) return;
+  const tokenInfo = tokenRegistry.get(address);
+  if (!tokenInfo) return;
+  if (tokenInfo.name === tokenInfo.symbol) {
+    return tokenInfo.name;
+  }
+  return `${tokenInfo.symbol} - ${tokenInfo.name}`;
+}
+
+/**
+ * shorten the checksummed version of the input address to have 4 characters at start and end
+ * @param address
+ * @param chars
+ * @returns
+ */
+export function shortenAddress(address: string, chars = 5): string {
+  return `${address.substring(0, chars)}...${address.substring(
+    address.length - chars
+  )}`;
+}
+
+export function addressLabel(
+  address: string,
+  tokenRegistry?: Map<string, TokenInfo>
+): string | undefined {
+  return (
+    programLabel(address) ||
+    SYSVAR_IDS[address] ||
+    SPECIAL_IDS[address] ||
+    tokenLabel(address, tokenRegistry)
+  );
+}
+
+export function displayAddress(address: string, shorten = true): string {
+  return addressLabel(address) ?? (shorten ? shortenAddress(address) : address);
+}
diff --git a/helpers/validators/pubkey.ts b/helpers/validators/pubkey.ts
new file mode 100644
index 00000000..cf08a27b
--- /dev/null
+++ b/helpers/validators/pubkey.ts
@@ -0,0 +1,49 @@
+import { Keypair, PublicKey } from "@solana/web3.js";
+import { coerce, instance, string } from "superstruct";
+import * as Yup from "yup";
+
+export const PublicKeyFromString = coerce(
+  instance(PublicKey),
+  string(),
+  (value) => new PublicKey(value)
+);
+
+/**
+ * Yup validator for a PublicKey.
+ */
+export const YupPublicKey = Yup.string().test(
+  "Public Key",
+  "Invalid public key",
+  (str) => {
+    if (!str) {
+      return true;
+    }
+    try {
+      new PublicKey(str);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+);
+
+export const YupKeypair = Yup.string().test(
+  "Keypair",
+  "Invalid keypair JSON",
+  (str) => {
+    if (!str) {
+      return true;
+    }
+    try {
+      return !!kpSeedToKP(str);
+    } catch (e) {
+      return false;
+    }
+  }
+);
+
+export const kpSeedToKP = (secretKey: string): Keypair => {
+  return Keypair.fromSecretKey(
+    Uint8Array.from(JSON.parse(secretKey) as number[])
+  );
+};
diff --git a/hooks/deploydao/stripTrailingNullBytes.ts b/hooks/deploydao/stripTrailingNullBytes.ts
new file mode 100644
index 00000000..42f4892b
--- /dev/null
+++ b/hooks/deploydao/stripTrailingNullBytes.ts
@@ -0,0 +1,9 @@
+export const stripTrailingNullBytes = (data: Buffer): Buffer => {
+  // need to call this in order to not mutate the original buffer
+  const reversed = Uint8Array.prototype.slice.call(data).reverse();
+  const lastNonNullByte =
+    reversed.length - reversed.findIndex((b) => b !== 0) - 1;
+  return Buffer.from(
+    Uint8Array.prototype.slice.call(data, 0, lastNonNullByte + 1)
+  );
+};
diff --git a/hooks/deploydao/types.ts b/hooks/deploydao/types.ts
new file mode 100644
index 00000000..851a1a87
--- /dev/null
+++ b/hooks/deploydao/types.ts
@@ -0,0 +1,174 @@
+/**
+ * Identifier of a verified program build.
+ */
+export interface Build {
+  slug: string;
+  org: string;
+  repoName: string;
+  source: string;
+  tag: string;
+}
+
+/**
+ * Miscellaneous information about a build.
+ */
+export interface BuildInfo {
+  anchorVersion: string;
+  createdAt: string;
+  repo: string;
+  tag: string;
+  slug: string;
+}
+
+/**
+ * Information about an individual build artifact.
+ */
+export interface ArtifactInfo {
+  /**
+   * Relative path of the artifact.
+   */
+  path: string;
+  /**
+   * Size of the artifact, in bytes.
+   */
+  size: number | null;
+  /**
+   * Artifact checksum.
+   */
+  checksum: string;
+  /**
+   * URL for downloading the artifact.
+   */
+  downloadURL: string;
+}
+
+/**
+ * A verified organization in `organizations.yml`.
+ */
+export interface VerifiedOrganization {
+  name: string;
+  github: string;
+  website?: string;
+}
+
+export interface Author {
+  /**
+   * GitHub username/organization name.
+   */
+  name: string;
+  /**
+   * Verified info from `organizations.yml`.
+   */
+  info: VerifiedOrganization | null;
+}
+
+/**
+ * Full description of a verified program build.
+ */
+export interface BuildDetails {
+  /**
+   * The Build.
+   */
+  build: Build;
+  /**
+   * Addresses of programs covered by the build.
+   */
+  addresses: Record<string, string>;
+  /**
+   * Build information.
+   */
+  info: BuildInfo | null;
+  /**
+   * List of all artifacts generated during this build and their file sizes.
+   */
+  artifacts: ArtifactInfo[];
+  /**
+   * Link to the workspace where the build took place.
+   */
+  workspaceURL: string;
+  /**
+   * Author of the build.
+   */
+  author: Author;
+}
+
+/**
+ * Information about a program published to the registry.
+ */
+export interface ProgramInfo {
+  /**
+   * Unique identifier of the program.
+   *
+   * This should be `$slug-$programName`.
+   */
+  id: string;
+  /**
+   * Name of the program, unscoped.
+   */
+  name: string;
+  /**
+   * Verified information about the organization, if applicable.
+   */
+  author: Author;
+  /**
+   * Rendered label for the program.
+   */
+  label: string;
+  /**
+   * Program address.
+   */
+  address: string;
+  /**
+   * GitHub information.
+   */
+  github: {
+    organization: string;
+    repo: string;
+  };
+}
+
+/**
+ * A verifiable program build.
+ */
+export interface VerifiableProgramRelease {
+  /**
+   * Globally unique identifier for the release.
+   *
+   * This is in the form of `@$org/$programName@$tag`.
+   */
+  id: string;
+  /**
+   * The program.
+   */
+  program: ProgramInfo;
+  /**
+   * The build artifact.
+   */
+  artifact: ArtifactInfo;
+  /**
+   * The trimmed build artifact. Its checksum is used to generate
+   */
+  trimmedArtifact: ArtifactInfo;
+  /**
+   * The IDL artifact.
+   */
+  idl: ArtifactInfo | null;
+  /**
+   * Full description of the build.
+   */
+  build: BuildDetails;
+}
+
+/**
+ * All information about a program.
+ */
+export interface ProgramDetails {
+  /**
+   * Program info.
+   */
+  program: ProgramInfo;
+  /**
+   * All known releases.
+   */
+  releases: VerifiableProgramRelease[];
+}
diff --git a/hooks/deploydao/useCanonicalVerifiableBuild.ts b/hooks/deploydao/useCanonicalVerifiableBuild.ts
new file mode 100644
index 00000000..08653bb8
--- /dev/null
+++ b/hooks/deploydao/useCanonicalVerifiableBuild.ts
@@ -0,0 +1,19 @@
+import { fetchNullableWithSessionCache } from "@saberhq/sail";
+import { useQuery } from "react-query";
+
+import type { VerifiableProgramRelease } from "./types";
+
+export const fetchCanonicalVerifiableBuild = async (checksum: string) => {
+  if (!checksum) {
+    return null;
+  }
+  return await fetchNullableWithSessionCache<VerifiableProgramRelease>(
+    `https://raw.githubusercontent.com/DeployDAO/solana-program-index/master/releases/by-trimmed-checksum/${checksum}.json`
+  );
+};
+
+export const useCanonicalVerifiableBuild = (checksum: string) => {
+  return useQuery(["canonicalVerifiableBuild", checksum], async () => {
+    return fetchCanonicalVerifiableBuild(checksum);
+  });
+};
diff --git a/hooks/deploydao/useProgramData.ts b/hooks/deploydao/useProgramData.ts
new file mode 100644
index 00000000..21717d44
--- /dev/null
+++ b/hooks/deploydao/useProgramData.ts
@@ -0,0 +1,57 @@
+import type { AccountParser } from "@saberhq/sail";
+import { useAccountData, useParsedAccountData } from "@saberhq/sail";
+import { u64 } from "@saberhq/token-utils";
+import { PublicKey } from "@solana/web3.js";
+import { useMemo } from "react";
+
+import { stripTrailingNullBytes } from "./stripTrailingNullBytes";
+
+const programDataParser: AccountParser<{
+  data: Buffer;
+  upgradeAuthority: PublicKey;
+  lastDeployedSlot: u64;
+}> = (info) => {
+  const lastDeployedSlot = u64.fromBuffer(
+    info.accountInfo.data.slice(4, 4 + 8)
+  );
+  const upgradeAuthority = new PublicKey(
+    info.accountInfo.data.slice(4 + 8 + 1, 4 + 8 + 1 + 32)
+  );
+  const data = info.accountInfo.data.slice(4 + 8 + 1 + 32);
+  return {
+    data,
+    lastDeployedSlot,
+    upgradeAuthority,
+  };
+};
+
+export const useProgramData = (programID: PublicKey) => {
+  const { data: program } = useAccountData(programID);
+
+  const programDataAddress = useMemo(() => {
+    if (!program) {
+      return program;
+    }
+    const data = program.accountInfo.data;
+    const programDataAddress = data.slice(4, 32 + 4);
+    return new PublicKey(programDataAddress);
+  }, [program]);
+
+  const { data: programData } = useParsedAccountData(
+    programDataAddress,
+    programDataParser
+  );
+
+  const canonicalData = useMemo(() => {
+    if (!programData) {
+      return programData;
+    }
+    const data = programData.accountInfo.data.data;
+    return stripTrailingNullBytes(data);
+  }, [programData]);
+
+  return {
+    programData,
+    canonicalData,
+  };
+};
diff --git a/hooks/deploydao/useProgramIndex.ts b/hooks/deploydao/useProgramIndex.ts
new file mode 100644
index 00000000..c813f76e
--- /dev/null
+++ b/hooks/deploydao/useProgramIndex.ts
@@ -0,0 +1,21 @@
+import { PublicKey } from "@solana/web3.js";
+import { useQuery } from "react-query";
+
+import type { ProgramInfo } from "./types";
+
+interface ProgramInfoParsed extends Omit<ProgramInfo, "address"> {
+  address: PublicKey;
+}
+
+export const useProgramIndex = () => {
+  return useQuery(
+    ["solanaProgramIndex"],
+    async (): Promise<ProgramInfoParsed[]> => {
+      const result = await fetch(
+        "https://raw.githubusercontent.com/DeployDAO/solana-program-index/master/programs.json"
+      );
+      const parsed = (await result.json()) as ProgramInfo[];
+      return parsed.map((p) => ({ ...p, address: new PublicKey(p.address) }));
+    }
+  );
+};
diff --git a/hooks/deploydao/useProgramMeta.ts b/hooks/deploydao/useProgramMeta.ts
new file mode 100644
index 00000000..cd668759
--- /dev/null
+++ b/hooks/deploydao/useProgramMeta.ts
@@ -0,0 +1,29 @@
+import { fetchNullableWithSessionCache } from "@saberhq/sail";
+import { useMemo } from "react";
+import { useQueries } from "react-query";
+import invariant from "tiny-invariant";
+
+import type { ProgramDetails } from "./types";
+
+export const useProgramMetas = (addresses: (string | null | undefined)[]) => {
+  return useQueries(
+    addresses.map((pid) => ({
+      queryKey: ["sprMeta", pid],
+      queryFn: async (): Promise<ProgramDetails | null> => {
+        if (!pid) {
+          return null;
+        }
+        return await fetchNullableWithSessionCache<ProgramDetails>(
+          `https://raw.githubusercontent.com/DeployDAO/solana-program-index/master/programs/${pid}.json`
+        );
+      },
+      enabled: !!pid,
+    }))
+  );
+};
+
+export const useProgramMeta = (address: string | null | undefined) => {
+  const result = useProgramMetas(useMemo(() => [address], [address]))[0];
+  invariant(result);
+  return result;
+};
diff --git a/hooks/deploydao/useProgramRelease.ts b/hooks/deploydao/useProgramRelease.ts
new file mode 100644
index 00000000..d052d836
--- /dev/null
+++ b/hooks/deploydao/useProgramRelease.ts
@@ -0,0 +1,20 @@
+import { useQuery } from "react-query";
+
+import type { VerifiableProgramRelease } from "./types";
+
+export const useProgramRelease = (
+  org: string,
+  programName: string,
+  version: string
+) => {
+  return useQuery(["programRelease", org, programName, version], async () => {
+    const result = await fetch(
+      `https://raw.githubusercontent.com/DeployDAO/solana-program-index/master/releases/by-name/%40${org}/${programName}%40${version}.json`
+    );
+    if (result.status === 404) {
+      return null;
+    }
+    const parsed = (await result.json()) as VerifiableProgramRelease;
+    return parsed;
+  });
+};
diff --git a/hooks/tribeca/useEscrow.ts b/hooks/tribeca/useEscrow.ts
new file mode 100644
index 00000000..a92b87b8
--- /dev/null
+++ b/hooks/tribeca/useEscrow.ts
@@ -0,0 +1,99 @@
+import { TokenAmount } from '@saberhq/token-utils';
+import { useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import { findEscrowAddress, VoteEscrow } from '@tribecahq/tribeca-sdk';
+import { useEscrowData, useLockerData } from 'helpers/parser';
+import { useSDK } from 'helpers/sdk';
+import { useEffect } from 'react';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import { useGovernor } from './useGovernor';
+
+export const useLocker = () => {
+  const { governorData } = useGovernor();
+  const lockerKey = governorData
+    ? governorData.account.electorate
+    : governorData;
+  return useLockerData(lockerKey);
+};
+
+export const useEscrow = (owner?: PublicKey) => {
+  const { tribecaMut } = useSDK();
+  const { network, wallet } = useSolana();
+  const { governorData, governor, veToken, govToken } = useGovernor();
+  const lockerKey = governorData
+    ? governorData.account.electorate
+    : governorData;
+
+  const { data: escrowKey } = useQuery(
+    ['escrowKey', network, lockerKey?.toString(), owner?.toString()],
+    async () => {
+      invariant(lockerKey && owner);
+      const [escrowKey] = await findEscrowAddress(lockerKey, owner);
+      return escrowKey;
+    },
+    {
+      enabled: !!(lockerKey && owner)
+    }
+  );
+  const { data: escrow, isLoading: isEscrowLoading } = useEscrowData(escrowKey);
+
+  const canLoadEscrow =
+    !!governorData && !!(lockerKey && owner && tribecaMut && escrow);
+  const result = useQuery(
+    ['escrow', escrow?.publicKey.toString()],
+    async () => {
+      invariant(lockerKey && owner && tribecaMut && escrow);
+      const escrowW = new VoteEscrow(
+        tribecaMut,
+        lockerKey,
+        governor,
+        escrow.publicKey,
+        owner
+      );
+      return {
+        escrow: escrow.account,
+        escrowW,
+        calculateVotingPower: await escrowW.makeCalculateVotingPower()
+      };
+    },
+    {
+      enabled: canLoadEscrow
+    }
+  );
+
+  const { refetch } = result;
+  useEffect(() => {
+    if (canLoadEscrow) {
+      void refetch();
+    }
+  }, [canLoadEscrow, escrow, refetch]);
+
+  const veBalance =
+    veToken && result.data
+      ? new TokenAmount(
+          veToken,
+          result.data.calculateVotingPower(new Date().getTime() / 1_000)
+        )
+      : null;
+
+  const govTokensLocked =
+    wallet && govToken
+      ? new TokenAmount(govToken, result.data ? result.data.escrow.amount : 0)
+      : null;
+
+  return {
+    ...result,
+    isEscrowLoading,
+    veBalance,
+    govTokensLocked,
+    escrow: escrow === null ? null : result.data,
+    escrowKey
+  };
+};
+
+export const useUserEscrow = () => {
+  const { tribecaMut } = useSDK();
+  return useEscrow(tribecaMut?.provider.wallet.publicKey);
+};
diff --git a/hooks/tribeca/useExecutiveCouncil.ts b/hooks/tribeca/useExecutiveCouncil.ts
new file mode 100644
index 00000000..5a22a436
--- /dev/null
+++ b/hooks/tribeca/useExecutiveCouncil.ts
@@ -0,0 +1,92 @@
+import { findSubaccountInfoAddress } from '@gokiprotocol/client';
+import { useTXHandlers } from '@saberhq/sail';
+import { TransactionEnvelope } from '@saberhq/solana-contrib';
+import { useMemo } from 'react';
+import { useQuery } from 'react-query';
+import {
+  useBatchedSubaccountInfos,
+  useGokiSmartWalletData
+} from 'helpers/parser';
+import { useOwnerInvokerAddress } from '../useSmartWalletAddress';
+import { useGovernor } from './useGovernor';
+import { useSDK } from 'helpers/sdk';
+
+export const useExecutiveCouncil = () => {
+  const { smartWallet } = useGovernor();
+  const { data: smartWalletData } = useGokiSmartWalletData(smartWallet);
+  const { sdkMut } = useSDK();
+  const { signAndConfirmTX } = useTXHandlers();
+
+  const { data: subaccountInfoKeys } = useQuery(
+    ['subaccountInfos', smartWalletData?.publicKey.toString()],
+    async () => {
+      if (!smartWalletData) {
+        return smartWalletData;
+      }
+      return await Promise.all(
+        smartWalletData.account.owners.map(async swOwner => {
+          const [sub] = await findSubaccountInfoAddress(swOwner);
+          return sub;
+        })
+      );
+    },
+    {
+      enabled: !!smartWalletData
+    }
+  );
+
+  const { data: subaccountInfos } =
+    useBatchedSubaccountInfos(subaccountInfoKeys);
+
+  const subaccountInfo = useMemo(
+    () =>
+      subaccountInfos?.find(
+        s => s && 'ownerInvoker' in s.account.subaccountType
+      ),
+    [subaccountInfos]
+  );
+
+  const ecKey = subaccountInfo?.account.smartWallet;
+  const ecWallet = useGokiSmartWalletData(ecKey);
+
+  const { data: ownerInvokerKey } = useOwnerInvokerAddress(ecKey, 0);
+
+  const isMemberOfEC = !!(
+    sdkMut &&
+    ecWallet.data?.account.owners.find(o =>
+      o.equals(sdkMut.provider.wallet.publicKey)
+    )
+  );
+
+  const buildOwnerInvokeTX = async (tx: TransactionEnvelope) => {
+    if (!isMemberOfEC || !ecWallet.data || !subaccountInfo) {
+      throw new Error('Not a member of the Executive Council');
+    }
+    const sw = await sdkMut.loadSmartWallet(ecWallet.data?.publicKey);
+    const allTXs = await Promise.all(
+      tx.instructions.map(async instruction => {
+        return await sw.ownerInvokeInstructionV2({
+          instruction,
+          index: subaccountInfo.account.index.toNumber()
+        });
+      })
+    );
+    const newTX = TransactionEnvelope.combineAll(...allTXs);
+    newTX.addSigners(...tx.signers);
+    return newTX;
+  };
+
+  const ownerInvokeTX = async (
+    ...[tx, ...rest]: Parameters<typeof signAndConfirmTX>
+  ) => {
+    return await signAndConfirmTX(await buildOwnerInvokeTX(tx), ...rest);
+  };
+
+  return {
+    ecWallet,
+    isMemberOfEC,
+    ownerInvokerKey,
+    buildOwnerInvokeTX,
+    ownerInvokeTX
+  };
+};
diff --git a/hooks/tribeca/useGovernor.ts b/hooks/tribeca/useGovernor.ts
new file mode 100644
index 00000000..f856d81e
--- /dev/null
+++ b/hooks/tribeca/useGovernor.ts
@@ -0,0 +1,180 @@
+import { useAccountData, usePubkey, useToken } from '@saberhq/sail';
+import { Token, TokenAmount } from '@saberhq/token-utils';
+import type { PublicKey } from '@solana/web3.js';
+import { GovernorWrapper } from '@tribecahq/tribeca-sdk';
+import { useMemo } from 'react';
+import { createContainer } from 'unstated-next';
+
+import { useSDK } from 'helpers/sdk';
+import { formatDurationSeconds } from 'helpers/format';
+import { useGovernorData, useLockerData } from 'helpers/parser';
+
+// export interface GaugeSettings {
+//   gaugemeister: PublicKey;
+// }
+
+// export type GovernorInfo = (
+//   | {
+//       key: PublicKey;
+//       meta: GovernorConfig | null;
+//       slug: string;
+//       loading: boolean;
+//     }
+//   | {
+//       key: PublicKey | null;
+//       meta: GovernorConfig | null;
+//       slug: string;
+//       loading: true;
+//     }
+// ) & {
+//   gauge: GaugeSettings | null;
+//   manifest: GovernorConfig | null | undefined;
+// };
+
+// export const useGovernorInfo = (): GovernorInfo | null => {
+//   const { governor: governorStr } = useParams<{ governor: string }>();
+//   const { data: governorMetas, isLoading, isFetched } = useTribecaRegistry();
+
+//   const governorMeta = useMemo(
+//     () =>
+//       governorMetas?.find(
+//         gov =>
+//           gov.address.toString() === governorStr || gov.slug === governorStr
+//       ) ?? null,
+//     [governorMetas, governorStr]
+//   );
+//   const slug = governorMeta?.slug ?? governorStr;
+
+//   const {
+//     data: manifest,
+//     isLoading: mfIsLoading,
+//     isFetched: mfIsFetched
+//   } = useGovernanceManifest(slug);
+
+//   const key = usePubkey(governorMeta?.address ?? governorStr);
+//   const gaugemeister = usePubkey(governorMeta?.gauge?.gaugemeister);
+
+//   const loading = isLoading || !isFetched || mfIsLoading || !mfIsFetched;
+//   if (loading && !key) {
+//     return {
+//       key: null,
+//       meta: governorMeta,
+//       manifest,
+//       slug,
+//       loading: true,
+//       gauge: null
+//     };
+//   }
+
+//   // If there is no key and we aren't loading, the governor doesn't exist.
+//   if (!key) {
+//     return null;
+//   }
+
+//   return {
+//     key,
+//     meta: governorMeta,
+//     slug,
+//     manifest,
+//     loading,
+//     gauge: gaugemeister ? { gaugemeister } : null
+//   };
+// };
+
+interface GovernorProps {
+  governor: PublicKey | undefined;
+  govToken: PublicKey | undefined;
+}
+
+const useGovernorInner = (props: GovernorProps | undefined) => {
+  if (!props || !props.governor) {
+    throw new Error('Governor not loaded.');
+  }
+  const { governor } = props!;
+  const { data: govDataRaw } = useAccountData(governor);
+  const { data: parsedGovernorData } = useGovernorData(governor);
+
+  const governorData =
+    govDataRaw === undefined ? undefined : parsedGovernorData;
+  const { data: lockerData } = useLockerData(
+    governorData ? governorData.account.electorate : governorData
+  );
+  console.log(lockerData);
+  const { data: backupGovToken } = useToken(
+    lockerData ? lockerData.account.tokenMint : lockerData
+  );
+
+  const govToken = props.govToken
+    ? new Token({
+        address: props.govToken.toBase58(),
+        symbol: 'HONEY',
+        name: 'HONEY',
+        chainId: 1,
+        decimals: 6
+      })
+    : backupGovToken;
+  const veToken = govToken
+    ? new Token({
+        ...govToken.info,
+        name: `Voting Escrow ${govToken.name}`,
+        symbol: `ve${govToken.symbol}`
+      })
+    : govToken;
+
+  const minActivationThreshold =
+    veToken && lockerData
+      ? new TokenAmount(
+          veToken,
+          lockerData.account.params.proposalActivationMinVotes
+        )
+      : null;
+
+  const lockedSupply =
+    govToken && lockerData
+      ? new TokenAmount(govToken, lockerData.account.lockedSupply)
+      : govToken === undefined && lockerData === undefined
+      ? undefined
+      : null;
+
+  const proposalCount = governorData
+    ? governorData.account.proposalCount.toNumber()
+    : governorData;
+
+  const { tribecaMut } = useSDK();
+  const governorW = useMemo(
+    () => (tribecaMut ? new GovernorWrapper(tribecaMut, governor!) : null),
+    [governor, tribecaMut]
+  );
+
+  const smartWallet = governorData
+    ? governorData.account.smartWallet
+    : governorData;
+
+  return {
+    governor,
+    governorW,
+    governorData,
+    lockerData,
+    govToken,
+    veToken,
+    minActivationThreshold,
+    lockedSupply,
+    proposalCount,
+    smartWallet
+  };
+};
+
+export const useGovernorParams = () => {
+  const { governorData, veToken } = useGovernor();
+  const votesForQuorum =
+    governorData && veToken
+      ? new TokenAmount(veToken, governorData.account.params.quorumVotes)
+      : null;
+  const votingPeriodFmt = governorData
+    ? formatDurationSeconds(governorData.account.params.votingPeriod.toNumber())
+    : null;
+  return { votesForQuorum, votingPeriodFmt };
+};
+
+export const { useContainer: useGovernor, Provider: GovernorProvider } =
+  createContainer(useGovernorInner);
diff --git a/hooks/tribeca/useProposalVotes.ts b/hooks/tribeca/useProposalVotes.ts
new file mode 100644
index 00000000..80df7dbf
--- /dev/null
+++ b/hooks/tribeca/useProposalVotes.ts
@@ -0,0 +1,3 @@
+export const useProposalVotes = () => {
+  return null;
+};
diff --git a/hooks/tribeca/useProposals.ts b/hooks/tribeca/useProposals.ts
new file mode 100644
index 00000000..77cc5de2
--- /dev/null
+++ b/hooks/tribeca/useProposals.ts
@@ -0,0 +1,265 @@
+import type { ParsedAccountInfo } from '@saberhq/sail';
+import { getCacheKeyOfPublicKey } from '@saberhq/sail';
+import { u64 } from '@saberhq/token-utils';
+import { useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import type { ProposalData, ProposalMetaData } from '@tribecahq/tribeca-sdk';
+import {
+  findProposalAddress,
+  findProposalMetaAddress,
+  getProposalState,
+  ProposalState
+} from '@tribecahq/tribeca-sdk';
+import BN from 'bn.js';
+import { useEffect, useMemo } from 'react';
+import { useQueries, useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import {
+  useParsedProposal,
+  useParsedProposalMeta,
+  useParsedProposalMetas,
+  useParsedProposals,
+  useParsedTXByKey,
+  useParsedTXByKeys
+} from 'helpers/parser';
+import { useGovernor } from './useGovernor';
+
+export const ZERO = new BN(0);
+
+export class ProposalStatus {
+  readonly state: ProposalState;
+  readonly executionTime: BN;
+
+  constructor(proposalState: ProposalState, executedAt: BN | undefined) {
+    this.state = proposalState;
+    this.executionTime = new BN(executedAt ?? '0');
+  }
+
+  get executed() {
+    return this.state === ProposalState.Queued && this.executionTime.gt(ZERO);
+  }
+}
+
+export interface ProposalInfo {
+  proposalKey: PublicKey;
+  index: number;
+  proposalData: ProposalData;
+  proposalMetaData: ProposalMetaData | null;
+  status: ProposalStatus;
+}
+
+const buildProposalInfo = ({
+  index,
+  proposalData,
+  proposalMetaData,
+  executedAt
+}: {
+  index: number;
+  proposalData: ParsedAccountInfo<ProposalData>;
+  proposalMetaData: ProposalMetaData | null;
+  executedAt: BN | undefined;
+}): ProposalInfo => {
+  const state = getProposalState({
+    proposalData: proposalData.accountInfo.data
+  });
+
+  return {
+    proposalKey: proposalData.accountId,
+    index,
+    proposalData: proposalData.accountInfo.data,
+    proposalMetaData: proposalMetaData,
+    status: new ProposalStatus(state, executedAt)
+  };
+};
+
+/**
+ * Fetches the data associated with a specific proposal.
+ */
+export const useProposal = (index: number) => {
+  const { network } = useSolana();
+  const { governor } = useGovernor();
+  const id = `000${index}`.slice(-4);
+
+  const proposalKeys = useQuery(
+    ['proposalKeys', network, governor.toString(), index],
+    async () => {
+      const [proposalKey] = await findProposalAddress(governor, new u64(index));
+      const [proposalMetaKey] = await findProposalMetaAddress(proposalKey);
+      return { proposalKey, proposalMetaKey };
+    }
+  );
+
+  const { data: proposalData } = useParsedProposal(
+    proposalKeys.data?.proposalKey
+  );
+  const { data: proposalMetaData } = useParsedProposalMeta(
+    proposalKeys.data?.proposalMetaKey
+  );
+
+  const queued = proposalData?.accountInfo.data.queuedAt.gt(ZERO);
+  const { data: txData } = useParsedTXByKey(
+    queued ? proposalData?.accountInfo.data.queuedTransaction : null
+  );
+
+  const isLoading =
+    (queued && !txData) || !proposalData || proposalMetaData === undefined;
+  const proposalInfoQuery = useQuery({
+    queryKey: ['proposalInfo', network, governor.toString(), index],
+    queryFn: (): ProposalInfo => {
+      invariant(proposalData);
+      return buildProposalInfo({
+        index: proposalData.accountInfo.data.index.toNumber(),
+        proposalData,
+        proposalMetaData: proposalMetaData
+          ? proposalMetaData.accountInfo.data
+          : null,
+        executedAt: txData?.accountInfo.data.executedAt
+      });
+    },
+    enabled: !isLoading
+  });
+
+  const { refetch } = proposalInfoQuery;
+  const executedAt = txData?.accountInfo.data.executedAt;
+  const info = isLoading ? null : proposalInfoQuery.data ?? null;
+  const state = proposalData
+    ? getProposalState({
+        proposalData: proposalData.accountInfo.data
+      })
+    : null;
+
+  useEffect(() => {
+    if (!isLoading || executedAt?.isZero()) {
+      void refetch();
+    }
+  }, [proposalData, refetch, proposalMetaData, state, isLoading, executedAt]);
+
+  useEffect(() => {
+    if (!proposalData) {
+      return;
+    }
+    if (state === ProposalState.Active) {
+      const timeRemaining =
+        proposalData.accountInfo.data.votingEndsAt.toNumber() * 1_000 -
+        Date.now();
+      return clearTimeout(
+        setTimeout(() => {
+          void refetch();
+        }, timeRemaining + 1)
+      );
+    }
+  }, [proposalData, refetch, state]);
+
+  return {
+    refetch,
+    info,
+    id,
+    index
+  };
+};
+
+/**
+ * Fetches the data associated with all proposals of the DAO.
+ *
+ * This includes both active and draft proposals. In the future, we may want to filter this
+ * out-- we should build an index somewhere for this.
+ *
+ * @returns
+ */
+export const useProposals = () => {
+  const { network } = useSolana();
+  const { governor, governorData, proposalCount } = useGovernor();
+  const proposalsKeys = useQueries(
+    proposalCount
+      ? Array(proposalCount)
+          .fill(null)
+          .map((_, i) => proposalCount - i - 1)
+          .map(i => ({
+            queryKey: ['proposalKeys', network, governor.toString(), i],
+            queryFn: async () => {
+              invariant(governorData);
+              const [proposalKey] = await findProposalAddress(
+                governorData.publicKey,
+                new u64(i)
+              );
+              const [proposalMetaKey] = await findProposalMetaAddress(
+                proposalKey
+              );
+              return { proposalKey, proposalMetaKey };
+            },
+            enabled: !!governorData
+          }))
+      : []
+  );
+
+  const proposalsKeysCache = proposalsKeys
+    .map(p => (p.data ? getCacheKeyOfPublicKey(p.data.proposalKey) : ''))
+    .join(',');
+  const proposalsData = useParsedProposals(
+    useMemo(
+      () => proposalsKeys.map(p => p.data?.proposalKey),
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      [proposalsKeysCache]
+    )
+  );
+  const proposalsMetaData = useParsedProposalMetas(
+    useMemo(
+      () => proposalsKeys.map(p => p.data?.proposalMetaKey),
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      [proposalsKeysCache]
+    )
+  );
+  const transactionsData = useParsedTXByKeys(
+    useMemo(
+      () =>
+        proposalsData
+          .filter(p => p?.accountInfo.data.queuedAt.gt(ZERO))
+          .map(p => p?.accountInfo.data.queuedTransaction),
+      [proposalsData]
+    )
+  );
+
+  const isLoading =
+    !proposalsData.every(p => p !== undefined) ||
+    !proposalsMetaData.every(p => p !== undefined) ||
+    !transactionsData.every(t => t !== undefined);
+
+  return useQueries(
+    proposalCount
+      ? Array(proposalCount)
+          .fill(null)
+          .map((_, i) => proposalCount - i - 1)
+          .map(i => ({
+            queryKey: ['proposalInfo', network, governor.toString(), i],
+            queryFn: (): ProposalInfo | null => {
+              const proposalData = proposalsData.find(
+                p => p?.accountInfo.data.index.toNumber() === i
+              );
+              if (!proposalData) {
+                return null;
+              }
+              const proposalMetaData = proposalsMetaData.find(p =>
+                p?.accountInfo.data.proposal.equals(proposalData.accountId)
+              );
+              const transactionData = transactionsData.find(t =>
+                t
+                  ? proposalData.accountInfo.data.queuedTransaction.equals(
+                      t.accountId
+                    )
+                  : false
+              );
+              return buildProposalInfo({
+                index: proposalData.accountInfo.data.index.toNumber(),
+                proposalData,
+                proposalMetaData: proposalMetaData
+                  ? proposalMetaData.accountInfo.data
+                  : null,
+                executedAt: transactionData?.accountInfo.data.executedAt
+              });
+            },
+            enabled: !isLoading
+          }))
+      : []
+  );
+};
diff --git a/hooks/tribeca/useVote.ts b/hooks/tribeca/useVote.ts
new file mode 100644
index 00000000..62b22641
--- /dev/null
+++ b/hooks/tribeca/useVote.ts
@@ -0,0 +1,23 @@
+import { useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import { findVoteAddress } from '@tribecahq/tribeca-sdk';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import { useParsedVote } from 'helpers/parser';
+
+export const useVote = (proposalKey?: PublicKey, voter?: PublicKey) => {
+  const { network } = useSolana();
+  const voteKey = useQuery(
+    ['voteKey', network, proposalKey?.toString(), voter?.toString()],
+    async () => {
+      invariant(proposalKey && voter);
+      const [escrowKey] = await findVoteAddress(proposalKey, voter);
+      return escrowKey;
+    },
+    {
+      enabled: !!(proposalKey && voter)
+    }
+  );
+  return useParsedVote(voteKey.data);
+};
diff --git a/hooks/useIDLs.ts b/hooks/useIDLs.ts
new file mode 100644
index 00000000..f0405d2b
--- /dev/null
+++ b/hooks/useIDLs.ts
@@ -0,0 +1,34 @@
+import { useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import { useQueries } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import { fetchIDL } from 'helpers/fetchers';
+import { KNOWN_NON_ANCHOR_PROGRAMS } from 'helpers/utils';
+
+export const useIDLs = (idls: (PublicKey | null | undefined)[]) => {
+  const { connection } = useSolana();
+  return useQueries(
+    idls.map(pid => ({
+      queryKey: ['idl', pid?.toString()],
+      queryFn: async () => {
+        invariant(pid);
+        if (KNOWN_NON_ANCHOR_PROGRAMS.has(pid.toString())) {
+          return { programID: pid, idl: null };
+        }
+        return {
+          programID: pid,
+          idl: await fetchIDL(connection, pid.toString())
+        };
+      },
+      enabled: !!pid,
+      staleTime: Infinity
+    }))
+  );
+};
+
+export const useIDL = (address: PublicKey | null | undefined) => {
+  const ret = useIDLs([address])[0];
+  invariant(ret);
+  return ret;
+};
diff --git a/hooks/useParsedInstruction.ts b/hooks/useParsedInstruction.ts
new file mode 100644
index 00000000..447b957a
--- /dev/null
+++ b/hooks/useParsedInstruction.ts
@@ -0,0 +1,195 @@
+import { BorshCoder } from '@project-serum/anchor';
+import type { InstructionDisplay } from '@project-serum/anchor/dist/cjs/coder/borsh/instruction';
+import type {
+  IdlAccount,
+  IdlAccountItem
+} from '@project-serum/anchor/dist/cjs/idl';
+import type { PublicKey, TransactionInstruction } from '@solana/web3.js';
+import type { ProposalInstruction } from '@tribecahq/tribeca-sdk';
+import { startCase } from 'lodash';
+import { useMemo } from 'react';
+
+import { parseNonAnchorInstruction } from 'helpers/instructions/parseNonAnchorInstruction';
+import { useIDL } from './useIDLs';
+import { useProgramLabel } from './useProgramMeta';
+
+const flattenIdlAccounts = (
+  accounts: IdlAccountItem[],
+  prefix?: string
+): IdlAccount[] => {
+  return accounts
+    .map(account => {
+      const accName = startCase(account.name);
+      if ('accounts' in account) {
+        const newPrefix = prefix ? `${prefix} > ${accName}` : accName;
+        return flattenIdlAccounts(account.accounts, newPrefix);
+      } else {
+        return {
+          ...account,
+          name: prefix ? `${prefix} > ${accName}` : accName
+        };
+      }
+    })
+    .flat();
+};
+
+export type InstructionData =
+  | {
+      type: 'raw';
+      data: Uint8Array;
+    }
+  | {
+      type: 'anchor';
+      args: { name: string; type: string; data: string }[];
+    }
+  | {
+      type: 'object';
+      args: unknown;
+    };
+
+export type InstructionAccount = {
+  name?: string;
+  pubkey: PublicKey;
+  isSigner: boolean;
+  isWritable: boolean;
+};
+
+export interface ParsedInstruction {
+  name: string;
+  data: InstructionData;
+  accounts: InstructionAccount[];
+}
+
+export interface RichParsedInstruction extends ParsedInstruction {
+  title: string;
+  programID: PublicKey;
+}
+
+export const useParsedProposalInstruction = (
+  ix: ProposalInstruction
+): RichParsedInstruction => {
+  return useParsedInstruction(
+    useMemo(() => ({ ...ix, data: Buffer.from(ix.data) }), [ix])
+  );
+};
+
+export const useParsedInstruction = (
+  ix: TransactionInstruction
+): RichParsedInstruction => {
+  const { data: idl } = useIDL(ix.programId);
+  const label = useProgramLabel(ix.programId);
+
+  const anchorIX = useMemo((): ParsedInstruction | null => {
+    if (!idl?.idl) {
+      return null;
+    }
+    const coder = new BorshCoder(idl.idl);
+    const decoded = coder.instruction.decode(Buffer.from(ix.data));
+    if (!decoded) {
+      return null;
+    }
+
+    const idlIx = idl.idl.instructions.find(i => decoded.name === i.name);
+    if (idlIx) {
+      const flatIdlAccounts = flattenIdlAccounts(idlIx.accounts);
+      const accounts = ix.keys.map((meta, idx) => {
+        if (idx < flatIdlAccounts.length) {
+          return {
+            name: flatIdlAccounts[idx]?.name ?? `Account #${idx + 1}`,
+            ...meta
+          };
+        }
+        // "Remaining accounts" are unnamed in Anchor.
+        else {
+          return {
+            name: `Account #${idx + 1}`,
+            ...meta
+          };
+        }
+      });
+      return {
+        name: decoded.name,
+        data: { type: 'object', args: decoded.data },
+        accounts
+      };
+    }
+    let parsed: InstructionDisplay | null = null;
+    try {
+      parsed = coder.instruction.format(decoded, ix.keys);
+    } catch (e) {
+      console.warn(`Error formatting instruction`, e);
+    }
+    if (parsed) {
+      return {
+        name: decoded.name,
+        data: { type: 'anchor', args: parsed.args },
+        accounts: parsed.accounts
+      };
+    }
+    if (idl.idl.state) {
+      const methodSoap = idl.idl.state.methods.find(
+        m => m.name === decoded.name
+      );
+      const parsed = new BorshCoder({
+        ...idl.idl,
+        instructions: methodSoap
+          ? [
+              {
+                ...methodSoap,
+                accounts: [
+                  {
+                    name: `Program State`,
+                    isMut: true,
+                    isSigner: false
+                  },
+                  ...methodSoap.accounts
+                ]
+              }
+            ]
+          : []
+      }).instruction.format(decoded, ix.keys);
+      if (!parsed) {
+        return null;
+      }
+      return {
+        name: decoded.name,
+        data: { type: 'anchor', args: parsed.args },
+        accounts: parsed.accounts
+      };
+    }
+    return null;
+  }, [idl?.idl, ix]);
+
+  const decodedIX = useMemo((): ParsedInstruction | null => {
+    if (anchorIX) {
+      return anchorIX;
+    }
+    const parsedNonAnchor = parseNonAnchorInstruction(ix);
+    if (!parsedNonAnchor || 'error' in parsedNonAnchor) {
+      return null;
+    }
+    const { name, accountLabels, program: _program, ...args } = parsedNonAnchor;
+    return {
+      name,
+      data: { type: 'object', args },
+      accounts: ix.keys.map((accountMeta, i): InstructionAccount => {
+        const label = accountLabels?.[i];
+        return {
+          ...accountMeta,
+          name: label ?? `Account #${i + 1}`
+        };
+      })
+    };
+  }, [anchorIX, ix]);
+
+  const name = decodedIX ? startCase(decodedIX.name) : 'Unknown Instruction';
+  const title = `${label}: ${name}`;
+
+  return {
+    title,
+    name,
+    data: decodedIX?.data ?? { type: 'raw', data: ix.data },
+    accounts: decodedIX?.accounts ?? ix.keys,
+    programID: ix.programId
+  };
+};
diff --git a/hooks/useProgramMeta.ts b/hooks/useProgramMeta.ts
new file mode 100644
index 00000000..640410ac
--- /dev/null
+++ b/hooks/useProgramMeta.ts
@@ -0,0 +1,40 @@
+import type { PublicKey } from '@solana/web3.js';
+
+import { displayAddress, programLabel } from 'helpers/utils';
+import type { ProgramDetails } from './deploydao/types';
+import { useProgramMeta } from './deploydao/useProgramMeta';
+
+const makeURL = (programID: string) =>
+  `https://raw.githubusercontent.com/DeployDAO/solana-program-index/master/programs/${programID}.json`;
+
+export interface ProgramMeta {
+  label: string;
+}
+
+export const fetchProgramMeta = async (
+  address: string
+): Promise<ProgramDetails | null> => {
+  const response = await fetch(makeURL(address));
+  if (response.status === 404) {
+    return null;
+  }
+  if (!response.ok) {
+    throw new Error('Network response was not ok');
+  }
+  return (await response.json()) as ProgramDetails;
+};
+
+export const useProgramLabel = (programId: PublicKey | null | undefined) => {
+  const { data: meta, isLoading } = useProgramMeta(programId?.toString());
+  const label =
+    meta?.program.label ??
+    (isLoading
+      ? programId
+        ? displayAddress(programId.toString())
+        : 'Loading...'
+      : programId
+      ? programLabel(programId.toString()) ??
+        `Unknown (${programId.toString()}) Program`
+      : 'Unknown Program');
+  return label;
+};
diff --git a/hooks/useSmartWalletAddress.tsx b/hooks/useSmartWalletAddress.tsx
new file mode 100644
index 00000000..6716585a
--- /dev/null
+++ b/hooks/useSmartWalletAddress.tsx
@@ -0,0 +1,35 @@
+import { findOwnerInvokerAddress, findSmartWallet } from '@gokiprotocol/client';
+import type { PublicKey } from '@solana/web3.js';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+export const useSmartWalletAddress = (base: PublicKey | null | undefined) => {
+  return useQuery(
+    ['walletKey', base?.toString()],
+    async () => {
+      invariant(base);
+      const [address] = await findSmartWallet(base);
+      return address;
+    },
+    {
+      enabled: !!base
+    }
+  );
+};
+
+export const useOwnerInvokerAddress = (
+  smartWallet: PublicKey | null | undefined,
+  index = 0
+) => {
+  return useQuery(
+    ['ownerInvoker', smartWallet?.toString()],
+    async () => {
+      invariant(smartWallet);
+      const [address] = await findOwnerInvokerAddress(smartWallet, index);
+      return address;
+    },
+    {
+      enabled: !!smartWallet
+    }
+  );
+};
diff --git a/icons/PulsingDot.tsx b/icons/PulsingDot.tsx
new file mode 100644
index 00000000..fd46feaf
--- /dev/null
+++ b/icons/PulsingDot.tsx
@@ -0,0 +1,35 @@
+export const PulsingDot = (props: { color: string }) => (
+  <svg
+    width="200"
+    height="200"
+    viewBox="0 0 40 40"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <circle
+      cx="20"
+      cy="20"
+      fill="none"
+      r="10"
+      stroke="currentcolor"
+      strokeWidth="2"
+    >
+      <animate
+        attributeName="r"
+        from="8"
+        to="20"
+        dur="1.5s"
+        begin="0s"
+        repeatCount="indefinite"
+      />
+      <animate
+        attributeName="opacity"
+        from="1"
+        to="0"
+        dur="1.5s"
+        begin="0s"
+        repeatCount="indefinite"
+      />
+    </circle>
+    <circle cx="20" cy="20" fill="currentcolor" r="10" />
+  </svg>
+);
diff --git a/package.json b/package.json
index e4b90183..85835c1b 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "@fontsource/ia-writer-mono": "^4.5.1",
     "@fontsource/inter": "^4.5.4",
     "@gemworks/gem-farm-ts": "^0.24.1",
+    "@gokiprotocol/client": "^0.10.4",
     "@gokiprotocol/walletkit": "^1.6.5",
     "@metaplex-foundation/mpl-auction": "^0.0.2",
     "@metaplex-foundation/mpl-core": "^0.0.4",
@@ -24,26 +25,34 @@
     "@nfteyez/sol-rayz": "^0.10.2",
     "@nfteyez/sol-rayz-react": "^0.10.2",
     "@project-serum/anchor": "^0.24.2",
-    "@saberhq/solana-contrib": "^1.12.48",
+    "@saberhq/anchor-contrib": "^1.13.1",
+    "@saberhq/sail": "3.4.4",
+    "@saberhq/snapshots": "^0.2.8",
+    "@saberhq/solana-contrib": "^1.13.1",
     "@saberhq/token-utils": "^1.12.48",
     "@saberhq/use-solana": "^1.12.48",
     "@solana/spl-token": "0.1.8",
     "@solana/web3.js": "^1.36.0",
+    "@tribecahq/tribeca-sdk": "^0.5.6",
     "@vanilla-extract/babel-plugin": "^1.1.4",
     "@vanilla-extract/css": "^1.6.8",
     "@vanilla-extract/next-plugin": "^2.0.1",
     "@vanilla-extract/sprinkles": "^1.4.0",
     "bn.js": "^5.2.0",
+    "date-fns": "^2.28.0",
     "degen": "^0.0.69",
     "jsbi": "^4.1.0",
     "next": "12.1.0",
     "react": "17.0.2",
     "react-countdown": "^2.3.2",
     "react-dom": "17.0.2",
+    "react-markdown": "^8.0.3",
     "react-number-format": "^4.9.1",
+    "react-query": "^3.39.0",
     "react-toastify": "^8.2.0",
     "recharts": "^2.1.9",
-    "yarn": "^1.22.18"
+    "yarn": "^1.22.18",
+    "yup": "^0.32.11"
   },
   "devDependencies": {
     "@types/node": "17.0.21",
diff --git a/pages/_app.tsx b/pages/_app.tsx
index cab56259..3f5fdc42 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,16 +1,23 @@
-import type { AppProps } from 'next/app';
-import { ThemeProvider } from 'degen';
-import 'degen/styles';
+import { useEffect, useState } from 'react';
 import { WalletKitProvider } from '@gokiprotocol/walletkit';
-import '../styles/globals.css';
 import { Network } from '@saberhq/solana-contrib';
+import { PartialNetworkConfigMap } from '@saberhq/use-solana/src/utils/useConnectionInternal';
+import { SailProvider } from '@saberhq/sail';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import { ReactQueryDevtools } from 'react-query/devtools';
+import type { AppProps } from 'next/app';
+import { ThemeProvider } from 'degen';
 import { ToastContainer } from 'react-toastify';
-import 'react-toastify/dist/ReactToastify.css';
 import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
-import { PartialNetworkConfigMap } from '@saberhq/use-solana/src/utils/useConnectionInternal';
-import { useEffect, useState } from 'react';
 import SecPopup from 'components/SecPopup';
+import { GOVERNOR_ADDRESS, SDKProvider } from 'helpers/sdk';
+
+import 'degen/styles';
+import '../styles/globals.css';
+import 'react-toastify/dist/ReactToastify.css';
+import { GovernorProvider } from 'hooks/tribeca/useGovernor';
 
+const queryClient = new QueryClient();
 const network = process.env.NETWORK as Network;
 const networkConfiguration = () => {
   if (process.env.NETWORK_CONFIGURATION) {
@@ -43,25 +50,34 @@ function MyApp({ Component, pageProps }: AppProps) {
       defaultMode="dark"
       defaultAccent={storedAccent || defaultAccent}
     >
-      <WalletKitProvider
-        defaultNetwork={network}
-        app={{
-          name: 'Honey Finance'
-        }}
-        networkConfigs={networkConfiguration()}
-      >
-        {/* {children} */}
-        {showPopup ? (
-          <SecPopup setShowPopup={setShowPopup} />
-        ) : (
-          <>
-            <Component {...pageProps} />
-            <ToastContainer theme="dark" position="bottom-right" />
-          </>
-        )}
-      </WalletKitProvider>
+      <QueryClientProvider client={queryClient}>
+        <ReactQueryDevtools initialIsOpen={false} />
+        <WalletKitProvider
+          defaultNetwork={network}
+          app={{
+            name: 'Honey Finance'
+          }}
+          networkConfigs={networkConfiguration()}
+        >
+          <SailProvider>
+            <SDKProvider>
+              <GovernorProvider initialState={{ governor: GOVERNOR_ADDRESS }}>
+                {/* {children} */}
+                {showPopup ? (
+                  <SecPopup setShowPopup={setShowPopup} />
+                ) : (
+                  <>
+                    <Component {...pageProps} />
+                    <ToastContainer theme="dark" position="bottom-right" />
+                  </>
+                )}
+              </GovernorProvider>
+            </SDKProvider>
+          </SailProvider>
+        </WalletKitProvider>
+      </QueryClientProvider>
     </ThemeProvider>
   );
 }
 
-export default MyApp;
\ No newline at end of file
+export default MyApp;
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 6a24f6a5..5246fb69 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -3,9 +3,11 @@ import {
   Box,
   Button,
   Card,
+  Heading,
   IconChevronRight,
   IconExclamation,
   Input,
+  Stat,
   Tag,
   Text
 } from 'degen';
@@ -19,6 +21,7 @@ import HoneyModal from 'components/HoneyModal/HoneyModal';
 import { PublicKey } from '@solana/web3.js';
 import { useConnectedWallet } from '@saberhq/use-solana';
 import { useWalletKit } from '@gokiprotocol/walletkit';
+import NumberFormat from 'react-number-format';
 import { useStake } from 'hooks/useStake';
 import { useAccounts } from 'hooks/useAccounts';
 import {
@@ -50,7 +53,7 @@ const Governance: NextPage = () => {
 
   const STAKE_POOL_ADDRESS = new PublicKey(
     process.env.NEXT_STAKE_POOL_ADDR ||
-      '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
+      'Cv9Hx3VRvqkz5JRPiZM8A2BH31yvpcT4qiUJLdtgu7TE'
   );
   const LOCKER_ADDRESS = new PublicKey(
     process.env.NEXT_LOCKER_ADDR ||
@@ -148,6 +151,45 @@ const Governance: NextPage = () => {
           </Text>
         </Box> */}
         {/* Cards row */}
+        <Box display="flex" width="full">
+          <Card level="2" padding="6" width="full">
+            <Box
+              display="flex"
+              alignItems="center"
+              flexDirection={{ xs: 'column', md: 'row' }}
+              justifyContent="space-between"
+            >
+              <Box
+                display="flex"
+                flexDirection={{ xs: 'column', md: 'row' }}
+                alignItems="center"
+              >
+                <IconExclamation color="accent" />
+                <Text variant="small" align="center">
+                  Pre-IDO HONEY (pHONEY) can be converted to HONEY at a 1:1
+                  ratio.{' '}
+                  <Text as="span" color="accent">
+                    You can increase this ratio by locking your tokens
+                  </Text>{' '}
+                  (and receive veHONEY). To participate in governance, you can
+                  lock your HONEY for veHONEY.
+                </Text>
+              </Box>
+              <Stack direction="horizontal" justify="center" align="center">
+                <Button
+                  as="a"
+                  href="https://docs.honey.finance/tokenomics/vehoney"
+                  target="_blank"
+                  size="small"
+                  variant="tertiary"
+                >
+                  Learn more
+                </Button>
+              </Stack>
+            </Box>
+          </Card>
+        </Box>
+
         <Stack
           direction={{
             lg: 'horizontal',
@@ -163,30 +205,42 @@ const Governance: NextPage = () => {
             alignItems="stretch"
             width={{ sm: 'full', md: '1/2' }}
           >
-            <Card level="2" padding="6">
-              <Box display="flex" height="full">
-                <Stack flex={1} justify="center" align="center" space="3">
-                  <IconExclamation color="accent" />
-                  <Text variant="small" align="center">
-                    Pre-IDO HONEY (pHONEY) can be converted to HONEY at a 1:1
-                    ratio.{' '}
-                    <Text as="span" color="accent">
-                      You can increase this ratio by locking your tokens
-                    </Text>{' '}
-                    (and receive veHONEY). To participate in governance, you can
-                    lock your HONEY for veHONEY.
-                  </Text>
-                  <Stack direction="horizontal" justify="center" align="center">
-                    <Button
-                      as="a"
-                      href="https://docs.honey.finance/tokenomics/vehoney"
-                      target="_blank"
-                      size="small"
-                      variant="tertiary"
-                    >
-                      Learn more
-                    </Button>
-                  </Stack>
+            <Card level="2" padding="6" width="full">
+              <Box display="flex" height="full" width="full">
+                <Stack flex={1} justify="space-around">
+                  <Stat
+                    label="Locked"
+                    value={
+                      <NumberFormat
+                        thousandSeparator
+                        value={1000000000}
+                        displayType={'text'}
+                      />
+                    }
+                    size="small"
+                  />
+                  <Stat
+                    label="Total Supply of veHONEY"
+                    value={
+                      <NumberFormat
+                        thousandSeparator
+                        value={1000000000}
+                        displayType={'text'}
+                      />
+                    }
+                    size="small"
+                  />
+                  <Stat
+                    label="Total Supply of HONEY"
+                    value={
+                      <NumberFormat
+                        thousandSeparator
+                        value={1000000000}
+                        displayType={'text'}
+                      />
+                    }
+                    size="small"
+                  />
                 </Stack>
               </Box>
             </Card>
@@ -251,7 +305,7 @@ const Governance: NextPage = () => {
                             <Text size="small">{pHoneyAmount}</Text>
                           </Stack>
                           <Stack justify="space-between" direction="horizontal">
-                            <Text size="small">$HONEY balance</Text>
+                            <Text size="small">HONEY balance</Text>
                             <Text size="small">{honeyAmount}</Text>
                           </Stack>
                         </Stack>
@@ -300,6 +354,15 @@ const Governance: NextPage = () => {
           borderRadius="2xLarge"
           backgroundColor="backgroundTertiary"
         >
+          <Text
+            weight="semiBold"
+            variant="large"
+            ellipsis
+            lineHeight="none"
+            whiteSpace="pre-wrap"
+          >
+            Recent Proposals
+          </Text>
           <Stack>
             {HIPS.map(hip => (
               <Box
diff --git a/pages/governance/proposals/create.tsx b/pages/governance/proposals/create.tsx
new file mode 100644
index 00000000..e2a18afd
--- /dev/null
+++ b/pages/governance/proposals/create.tsx
@@ -0,0 +1,13 @@
+import { NextPage } from 'next';
+import Layout from 'components/Layout/Layout';
+import { ProposalCreateView } from 'components/Proposals/ProposalCreateView/locked-voter';
+
+const ProposalCreate: NextPage = () => {
+  return (
+    <Layout>
+      <ProposalCreateView />
+    </Layout>
+  );
+};
+
+export default ProposalCreate;
diff --git a/pages/governance/proposals/index.tsx b/pages/governance/proposals/index.tsx
new file mode 100644
index 00000000..da5ce804
--- /dev/null
+++ b/pages/governance/proposals/index.tsx
@@ -0,0 +1,16 @@
+import { NextPage } from 'next';
+import { useState } from 'react';
+import { ProposalsList } from 'components/Proposals/ProposalsList';
+import Layout from 'components/Layout/Layout';
+
+const Proposals: NextPage = () => {
+  const [showDrafts, setShowDrafts] = useState(false);
+
+  return (
+    <Layout>
+      <ProposalsList showDrafts={showDrafts} />
+    </Layout>
+  );
+};
+
+export default Proposals;
diff --git a/yarn.lock b/yarn.lock
index f983a8f1..fe9f42f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -186,7 +186,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.1.2":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.15.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
   integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
@@ -385,6 +385,16 @@
     "@solana/wallet-adapter-base" "^0.8.1"
     "@solana/web3.js" "^1.31.0"
 
+"@gokiprotocol/client@^0.10.4":
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/@gokiprotocol/client/-/client-0.10.4.tgz#3848858b4b5768b9af372d8d882c002fc15b251b"
+  integrity sha512-HY48FqG5rdtqnhbyU0Fsq1MEl5bSo2majgYOR7mJBJckRs1bJ5zD71YJFhFZ+3wKtz2HcaUloRNrqloFt1Gc+g==
+  dependencies:
+    lodash.mapvalues "^4.6.0"
+    superstruct "^0.15.4"
+    tiny-invariant "^1.2.0"
+    tslib "^2.3.1"
+
 "@gokiprotocol/walletkit@^1.6.5":
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/@gokiprotocol/walletkit/-/walletkit-1.6.6.tgz#a5d02887bb1c1f00ac84a52ef22bfae997522153"
@@ -787,7 +797,45 @@
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz#782fa5da44c4f38ae9fd38e9184b54e451936118"
   integrity sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg==
 
-"@saberhq/solana-contrib@^1.12.48", "@saberhq/solana-contrib@^1.12.56":
+"@saberhq/anchor-contrib@^1.13.1":
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/@saberhq/anchor-contrib/-/anchor-contrib-1.13.1.tgz#457385ce4533363b983c1ff97251dff2e94259e1"
+  integrity sha512-ZiZAqiQLTpFU43zQfLyoEkJjt+0LW5ZSm63wqc7xm0hKOw/ronMkNOslqXbNqIp2rRRg8GzOFgid4TAEWqzuOw==
+  dependencies:
+    "@saberhq/solana-contrib" "^1.13.1"
+    eventemitter3 "^4.0.7"
+    lodash.camelcase "^4.3.0"
+    lodash.mapvalues "^4.6.0"
+    tslib "^2.4.0"
+
+"@saberhq/sail@3.4.4":
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/@saberhq/sail/-/sail-3.4.4.tgz#c30ed5318aa142a6bf5c8fc2b511a67cc7a85eaa"
+  integrity sha512-/DP6ree/z64sgNdY1cI0fK55bhwKBQ+6aQEsfHRBZP161t5yhBrN7ApoggUt6TZJd8fEwxC3unPDGK3gJ8AMhQ==
+  dependencies:
+    dataloader "^2.1.0"
+    eventemitter3 "^4.0.7"
+    lodash.chunk "^4.2.0"
+    lodash.mapvalues "^4.6.0"
+    lodash.uniq "^4.5.0"
+    lodash.zip "^4.2.0"
+    retry "^0.13.1"
+    tiny-invariant "^1.2.0"
+    tslib "^2.4.0"
+    unstated-next "^1.1.0"
+    use-debounce "^7.0.1"
+
+"@saberhq/snapshots@^0.2.8":
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/@saberhq/snapshots/-/snapshots-0.2.8.tgz#03ac0748d58434696f0ad2eb0d7da7f97f7d76ed"
+  integrity sha512-IqcKPRD/OpY8SUiuaaixdtA0GUZ0vM42/ofPIKqa30bIfJa3r/e/M9wOM7OC1lGVEpicl84mMIFi/lFUvEZsmA==
+  dependencies:
+    "@solana/buffer-layout" "^4.0.0"
+    superstruct "^0.15.4"
+    tiny-invariant "^1.2.0"
+    tslib "^2.3.1"
+
+"@saberhq/solana-contrib@^1.12.56":
   version "1.12.56"
   resolved "https://registry.yarnpkg.com/@saberhq/solana-contrib/-/solana-contrib-1.12.56.tgz#0472ba6960d9993c37808697d7afff5b63e11b14"
   integrity sha512-b6Szv+XqJE9pFqQ6QfQluRyvQIXAdmLk/KrZ2Ks/XtQVMX2ZxdBf5mGozGNa8NzuzgeOzj/BQ8akbAazfll5dw==
@@ -799,6 +847,19 @@
     tiny-invariant "^1.2.0"
     tslib "^2.3.1"
 
+"@saberhq/solana-contrib@^1.13.1":
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/@saberhq/solana-contrib/-/solana-contrib-1.13.1.tgz#b1b583c13ea80d191736947d27b25ca5dd59fd77"
+  integrity sha512-2hWKZS8bhH1QXVzkf0OoMDdNDc/POCUUbKQEGwZBv+ri/9GUkfihYm6TPgVecmqa6PM1qMtUDGqrC529Pi/4mQ==
+  dependencies:
+    "@solana/buffer-layout" "^4.0.0"
+    "@types/promise-retry" "^1.1.3"
+    "@types/retry" "^0.12.2"
+    promise-retry "^2.0.1"
+    retry "^0.13.1"
+    tiny-invariant "^1.2.0"
+    tslib "^2.4.0"
+
 "@saberhq/token-utils@^1.12.48":
   version "1.12.56"
   resolved "https://registry.yarnpkg.com/@saberhq/token-utils/-/token-utils-1.12.56.tgz#c86e5e14f1525502c51243cd6f5ddbb0ba118316"
@@ -1022,6 +1083,15 @@
     eventemitter3 "^4.0.7"
     uuid "^8.3.2"
 
+"@tribecahq/tribeca-sdk@^0.5.6":
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/@tribecahq/tribeca-sdk/-/tribeca-sdk-0.5.6.tgz#c0e5cdbb01250de305245bdb3802429c25ec58f8"
+  integrity sha512-ilH5axrUsj2l2yfI2996hJJIvlfUAaaAmLhKLXxVgbByN3qFdrnj3G5qVYxrmECzzU/bkfyNcJt1WyCxpcQ9XQ==
+  dependencies:
+    superstruct "^0.15.4"
+    tiny-invariant "^1.2.0"
+    tslib "^2.3.1"
+
 "@types/bn.js@^4.11.5":
   version "4.11.6"
   resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c"
@@ -1086,6 +1156,13 @@
   resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-2.1.1.tgz#743fdc821c81f86537cbfece07093ac39b4bc342"
   integrity sha512-9MVYlmIgmRR31C5b4FVSWtuMmBHh2mOWQYfl7XAYOa8dsnb7iEmUmRSWSFgXFtkjxO65d7hTUHQC+RhR/9IWFg==
 
+"@types/debug@^4.0.0":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
+  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+  dependencies:
+    "@types/ms" "*"
+
 "@types/express-serve-static-core@^4.17.9":
   version "4.17.28"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
@@ -1103,6 +1180,13 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/hast@^2.0.0":
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc"
+  integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==
+  dependencies:
+    "@types/unist" "*"
+
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -1113,11 +1197,33 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.180.tgz#4ab7c9ddfc92ec4a887886483bc14c79fb380670"
   integrity sha512-XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g==
 
+"@types/lodash@^4.14.175":
+  version "4.14.182"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
+  integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
+
+"@types/mdast@^3.0.0":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
+  integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
+  dependencies:
+    "@types/unist" "*"
+
+"@types/mdurl@^1.0.0":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
+  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
+
 "@types/minimatch@*":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
+"@types/ms@*":
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
+  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+
 "@types/node@*":
   version "17.0.23"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
@@ -1160,6 +1266,11 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
   integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
 
+"@types/prop-types@^15.0.0":
+  version "15.7.5"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
+  integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
+
 "@types/qs@*":
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
@@ -1198,11 +1309,21 @@
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
   integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
 
+"@types/retry@^0.12.2":
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a"
+  integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==
+
 "@types/scheduler@*":
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
   integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
+"@types/unist@*", "@types/unist@^2.0.0":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
+  integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
+
 "@types/ws@^7.4.4":
   version "7.4.7"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702"
@@ -1593,6 +1714,11 @@ babel-plugin-macros@^2.6.1:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
+bail@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.2.tgz#d26f5cd8fe5d6f832a31517b9f7c356040ba6d5d"
+  integrity sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -1628,6 +1754,11 @@ batch@0.6.1:
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
+big-integer@^1.6.16:
+  version "1.6.51"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"
+  integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -1751,6 +1882,20 @@ braces@^3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
+broadcast-channel@^3.4.1:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-3.7.0.tgz#2dfa5c7b4289547ac3f6705f9c00af8723889937"
+  integrity sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    detect-node "^2.1.0"
+    js-sha3 "0.8.0"
+    microseconds "0.2.0"
+    nano-time "1.0.0"
+    oblivious-set "1.0.0"
+    rimraf "3.0.2"
+    unload "2.2.0"
+
 brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1886,6 +2031,11 @@ chalk@^4.0.0, chalk@^4.1.1:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+character-entities@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.1.tgz#98724833e1e27990dee0bd0f2b8a859c3476aac7"
+  integrity sha512-OzmutCf2Kmc+6DrFrrPS8/tDh2+DpnrfzdICHWhcVC9eOd0N1PXmQEE1a8iM4IziIAG+8tmTq3K+oo0ubH6RRQ==
+
 chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -1998,6 +2148,11 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
+comma-separated-tokens@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz#d4c25abb679b7751c880be623c1179780fe1dd98"
+  integrity sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==
+
 commander@^2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2246,6 +2401,16 @@ damerau-levenshtein@^1.0.7:
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
+dataloader@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.1.0.tgz#c69c538235e85e7ac6c6c444bae8ecabf5de9df7"
+  integrity sha512-qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ==
+
+date-fns@^2.28.0:
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
+  integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
+
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -2260,7 +2425,7 @@ debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -2277,6 +2442,13 @@ decimal.js-light@^2.4.1, decimal.js-light@^2.5.1:
   resolved "https://registry.yarnpkg.com/decimal.js-light/-/decimal.js-light-2.5.1.tgz#134fd32508f19e208f4fb2f8dac0d2626a867934"
   integrity sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==
 
+decode-named-character-reference@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.1.tgz#57b2bd9112659cacbc449d3577d7dadb8e1f3d1b"
+  integrity sha512-YV/0HQHreRwKb7uBopyIkLG17jG6Sv2qUchk9qSoVJ2f+flwRsPNBO0hAnjt6mTNYUT+vw9Gy2ihXg4sUWPi2w==
+  dependencies:
+    character-entities "^2.0.0"
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -2387,6 +2559,11 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
+dequal@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d"
+  integrity sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug==
+
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
@@ -2397,11 +2574,16 @@ detect-node-es@^1.1.0:
   resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493"
   integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==
 
-detect-node@^2.0.4:
+detect-node@^2.0.4, detect-node@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
+diff@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -2962,6 +3144,11 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
+extend@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -3414,6 +3601,11 @@ hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hast-util-whitespace@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz#4fc1086467cc1ef5ba20673cb6b03cec3a970f1c"
+  integrity sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg==
+
 hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -3561,6 +3753,11 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
+inline-style-parser@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
+  integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
+
 internal-ip@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -3664,6 +3861,11 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-buffer@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
+  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
+
 is-builtin-module@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.1.0.tgz#6fdb24313b1c03b75f8b9711c0feb8c30b903b00"
@@ -3801,6 +4003,11 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
+is-plain-obj@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.0.0.tgz#06c0999fd7574edf5a906ba5644ad0feb3a84d22"
+  integrity sha512-NXRbBtUdBioI73y/HmOhogw/U5msYPC9DAtGkJXeFcFWSFZw0mCUsPxk/snTuJHzNKA8kLBK4rH97RMB1BfCXw==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -3915,7 +4122,7 @@ js-sha256@^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.8.0:
+js-sha3@0.8.0, js-sha3@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"
   integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==
@@ -4016,6 +4223,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+kleur@^4.0.3:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.4.tgz#8c202987d7e577766d039a8cd461934c01cda04d"
+  integrity sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA==
+
 language-subtag-registry@~0.3.2:
   version "0.3.21"
   resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz#04ac218bea46f04cb039084602c6da9e788dd45a"
@@ -4080,11 +4292,26 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
+lodash-es@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
+
 lodash.chunk@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.chunk/-/lodash.chunk-4.2.0.tgz#66e5ce1f76ed27b4303d8c6512e8d1216e8106bc"
   integrity sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=
 
+lodash.mapvalues@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
+  integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=
+
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
@@ -4095,6 +4322,16 @@ lodash.orderby@^4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.6.0.tgz#e697f04ce5d78522f54d9338b32b81a3393e4eb3"
   integrity sha1-5pfwTOXXhSL1TZM4syuBozk+TrM=
 
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
+lodash.zip@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020"
+  integrity sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=
+
 lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -4138,6 +4375,14 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+match-sorter@^6.0.2:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.1.tgz#98cc37fda756093424ddf3cbc62bfe9c75b92bda"
+  integrity sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    remove-accents "0.4.2"
+
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -4147,6 +4392,59 @@ md5.js@^1.3.4:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
+mdast-util-definitions@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.0.tgz#b6d10ef00a3c4cf191e8d9a5fa58d7f4a366f817"
+  integrity sha512-5hcR7FL2EuZ4q6lLMUK5w4lHT2H3vqL9quPvYZ/Ku5iifrirfMHiGdhxdXMUbUkDmz5I+TYMd7nbaxUhbQkfpQ==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.0"
+    unist-util-visit "^3.0.0"
+
+mdast-util-from-markdown@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz#84df2924ccc6c995dec1e2368b2b208ad0a76268"
+  integrity sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.0"
+    decode-named-character-reference "^1.0.0"
+    mdast-util-to-string "^3.1.0"
+    micromark "^3.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-decode-string "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    unist-util-stringify-position "^3.0.0"
+    uvu "^0.5.0"
+
+mdast-util-to-hast@^12.1.0:
+  version "12.1.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.1.1.tgz#89a2bb405eaf3b05eb8bf45157678f35eef5dbca"
+  integrity sha512-qE09zD6ylVP14jV4mjLIhDBOrpFdShHZcEsYvvKGABlr9mGbV7mTlRWdoFxL/EYSTNDiC9GZXy7y8Shgb9Dtzw==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    "@types/mdast" "^3.0.0"
+    "@types/mdurl" "^1.0.0"
+    mdast-util-definitions "^5.0.0"
+    mdurl "^1.0.0"
+    micromark-util-sanitize-uri "^1.0.0"
+    unist-builder "^3.0.0"
+    unist-util-generated "^2.0.0"
+    unist-util-position "^4.0.0"
+    unist-util-visit "^4.0.0"
+
+mdast-util-to-string@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9"
+  integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==
+
+mdurl@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -4175,6 +4473,201 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
+micromark-core-commonmark@^1.0.1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz#edff4c72e5993d93724a3c206970f5a15b0585ad"
+  integrity sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA==
+  dependencies:
+    decode-named-character-reference "^1.0.0"
+    micromark-factory-destination "^1.0.0"
+    micromark-factory-label "^1.0.0"
+    micromark-factory-space "^1.0.0"
+    micromark-factory-title "^1.0.0"
+    micromark-factory-whitespace "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-chunked "^1.0.0"
+    micromark-util-classify-character "^1.0.0"
+    micromark-util-html-tag-name "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-resolve-all "^1.0.0"
+    micromark-util-subtokenize "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.1"
+    uvu "^0.5.0"
+
+micromark-factory-destination@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz#fef1cb59ad4997c496f887b6977aa3034a5a277e"
+  integrity sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-factory-label@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz#6be2551fa8d13542fcbbac478258fb7a20047137"
+  integrity sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+
+micromark-factory-space@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz#cebff49968f2b9616c0fcb239e96685cb9497633"
+  integrity sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-factory-title@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz#7e09287c3748ff1693930f176e1c4a328382494f"
+  integrity sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A==
+  dependencies:
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+
+micromark-factory-whitespace@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz#e991e043ad376c1ba52f4e49858ce0794678621c"
+  integrity sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==
+  dependencies:
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-character@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.1.0.tgz#d97c54d5742a0d9611a68ca0cd4124331f264d86"
+  integrity sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-chunked@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz#5b40d83f3d53b84c4c6bce30ed4257e9a4c79d06"
+  integrity sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-classify-character@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz#cbd7b447cb79ee6997dd274a46fc4eb806460a20"
+  integrity sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-combine-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz#91418e1e74fb893e3628b8d496085639124ff3d5"
+  integrity sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==
+  dependencies:
+    micromark-util-chunked "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-decode-numeric-character-reference@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz#dcc85f13b5bd93ff8d2868c3dba28039d490b946"
+  integrity sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-decode-string@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz#942252ab7a76dec2dbf089cc32505ee2bc3acf02"
+  integrity sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q==
+  dependencies:
+    decode-named-character-reference "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-encode@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz#2c1c22d3800870ad770ece5686ebca5920353383"
+  integrity sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==
+
+micromark-util-html-tag-name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.0.0.tgz#75737e92fef50af0c6212bd309bc5cb8dbd489ed"
+  integrity sha512-NenEKIshW2ZI/ERv9HtFNsrn3llSPZtY337LID/24WeLqMzeZhBEE6BQ0vS2ZBjshm5n40chKtJ3qjAbVV8S0g==
+
+micromark-util-normalize-identifier@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz#4a3539cb8db954bbec5203952bfe8cedadae7828"
+  integrity sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-resolve-all@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz#a7c363f49a0162e931960c44f3127ab58f031d88"
+  integrity sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==
+  dependencies:
+    micromark-util-types "^1.0.0"
+
+micromark-util-sanitize-uri@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz#27dc875397cd15102274c6c6da5585d34d4f12b2"
+  integrity sha512-cCxvBKlmac4rxCGx6ejlIviRaMKZc0fWm5HdCHEeDWRSkn44l6NdYVRyU+0nT1XC72EQJMZV8IPHF+jTr56lAg==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-encode "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-subtokenize@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz#ff6f1af6ac836f8bfdbf9b02f40431760ad89105"
+  integrity sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA==
+  dependencies:
+    micromark-util-chunked "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+
+micromark-util-symbol@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz#b90344db62042ce454f351cf0bebcc0a6da4920e"
+  integrity sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==
+
+micromark-util-types@^1.0.0, micromark-util-types@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.0.2.tgz#f4220fdb319205812f99c40f8c87a9be83eded20"
+  integrity sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==
+
+micromark@^3.0.0:
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.0.10.tgz#1eac156f0399d42736458a14b0ca2d86190b457c"
+  integrity sha512-ryTDy6UUunOXy2HPjelppgJ2sNfcPz1pLlMdA6Rz9jPzhLikWXv/irpWV/I2jd68Uhmny7hHxAlAhk4+vWggpg==
+  dependencies:
+    "@types/debug" "^4.0.0"
+    debug "^4.0.0"
+    decode-named-character-reference "^1.0.0"
+    micromark-core-commonmark "^1.0.1"
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-chunked "^1.0.0"
+    micromark-util-combine-extensions "^1.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-encode "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-resolve-all "^1.0.0"
+    micromark-util-sanitize-uri "^1.0.0"
+    micromark-util-subtokenize "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.1"
+    uvu "^0.5.0"
+
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -4202,6 +4695,11 @@ micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
+microseconds@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/microseconds/-/microseconds-0.2.0.tgz#233b25f50c62a65d861f978a4a4f8ec18797dc39"
+  integrity sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA==
+
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
@@ -4266,6 +4764,11 @@ mkdirp@^0.5.1, mkdirp@^0.5.5:
   dependencies:
     minimist "^1.2.6"
 
+mri@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
+  integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -4299,6 +4802,18 @@ nan@^2.12.1, nan@^2.13.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
+nano-time@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/nano-time/-/nano-time-1.0.0.tgz#b0554f69ad89e22d0907f7a12b0993a5d96137ef"
+  integrity sha1-sFVPaa2J4i0JB/ehKwmTpdlhN+8=
+  dependencies:
+    big-integer "^1.6.16"
+
+nanoclone@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4"
+  integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
+
 nanoid@^3.1.30:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
@@ -4514,6 +5029,11 @@ object.values@^1.1.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
+oblivious-set@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/oblivious-set/-/oblivious-set-1.0.0.tgz#c8316f2c2fb6ff7b11b6158db3234c49f733c566"
+  integrity sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw==
+
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
@@ -4841,7 +5361,7 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@^15.0.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -4850,6 +5370,16 @@ prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+property-expr@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4"
+  integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==
+
+property-information@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.1.1.tgz#5ca85510a3019726cb9afed4197b7b8ac5926a22"
+  integrity sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==
+
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -4970,11 +5500,37 @@ react-is@^16.10.2, react-is@^16.13.1, react-is@^16.7.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
+react-is@^18.0.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67"
+  integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==
+
 react-lifecycles-compat@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
+react-markdown@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.3.tgz#e8aba0d2f5a1b2124d476ee1fff9448a2f57e4b3"
+  integrity sha512-We36SfqaKoVNpN1QqsZwWSv/OZt5J15LNgTLWynwAN5b265hrQrsjMtlRNwUvS+YyR3yDM8HpTNc4pK9H/Gc0A==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    "@types/prop-types" "^15.0.0"
+    "@types/unist" "^2.0.0"
+    comma-separated-tokens "^2.0.0"
+    hast-util-whitespace "^2.0.0"
+    prop-types "^15.0.0"
+    property-information "^6.0.0"
+    react-is "^18.0.0"
+    remark-parse "^10.0.0"
+    remark-rehype "^10.0.0"
+    space-separated-tokens "^2.0.0"
+    style-to-object "^0.3.0"
+    unified "^10.0.0"
+    unist-util-visit "^4.0.0"
+    vfile "^5.0.0"
+
 react-number-format@^4.9.1:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/react-number-format/-/react-number-format-4.9.1.tgz#62b3450b43c911f9227e770a8ea9fa606696e52e"
@@ -4982,6 +5538,15 @@ react-number-format@^4.9.1:
   dependencies:
     prop-types "^15.7.2"
 
+react-query@^3.39.0:
+  version "3.39.0"
+  resolved "https://registry.yarnpkg.com/react-query/-/react-query-3.39.0.tgz#0caca7b0da98e65008bbcd4df0d25618c2100050"
+  integrity sha512-Od0IkSuS79WJOhzWBx/ys0x13+7wFqgnn64vBqqAAnZ9whocVhl/y1padD5uuZ6EIkXbFbInax0qvY7zGM0thA==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    broadcast-channel "^3.4.1"
+    match-sorter "^6.0.2"
+
 react-remove-scroll-bar@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.2.0.tgz#d4d545a7df024f75d67e151499a6ab5ac97c8cdd"
@@ -5174,6 +5739,30 @@ regexpp@^3.2.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
+remark-parse@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-10.0.1.tgz#6f60ae53edbf0cf38ea223fe643db64d112e0775"
+  integrity sha512-1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    mdast-util-from-markdown "^1.0.0"
+    unified "^10.0.0"
+
+remark-rehype@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-10.1.0.tgz#32dc99d2034c27ecaf2e0150d22a6dcccd9a6279"
+  integrity sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    "@types/mdast" "^3.0.0"
+    mdast-util-to-hast "^12.1.0"
+    unified "^10.0.0"
+
+remove-accents@0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.4.2.tgz#0a43d3aaae1e80db919e07ae254b285d9e1c7bb5"
+  integrity sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U=
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -5273,6 +5862,13 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
+rimraf@3.0.2, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -5280,13 +5876,6 @@ rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -5323,6 +5912,13 @@ rxjs@6:
   dependencies:
     tslib "^1.9.0"
 
+sade@^1.7.3:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
+  integrity sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==
+  dependencies:
+    mri "^1.1.0"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -5609,6 +6205,11 @@ source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
+space-separated-tokens@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz#43193cec4fb858a2ce934b7f98b7f2c18107098b"
+  integrity sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw==
+
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -5774,6 +6375,13 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+style-to-object@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
+  integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==
+  dependencies:
+    inline-style-parser "0.1.1"
+
 styled-jsx@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.0.tgz#816b4b92e07b1786c6b7111821750e0ba4d26e77"
@@ -5789,6 +6397,11 @@ superstruct@^0.14.2:
   resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.14.2.tgz#0dbcdf3d83676588828f1cf5ed35cda02f59025b"
   integrity sha512-nPewA6m9mR3d6k7WkZ8N8zpTWfenFH3q9pA2PkuiZxINr9DKB2+40wEQf0ixn8VaGuJ78AB6iWOtStI+/4FKZQ==
 
+superstruct@^0.15.4:
+  version "0.15.4"
+  resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.15.4.tgz#e3381dd84ca07e704e19f69eda74eee1a5efb1f9"
+  integrity sha512-eOoMeSbP9ZJChNOm/9RYjE+F36rYR966AAqeG3xhQB02j2sfAUXDp4EQ/7bAOqnlJnuFDB8yvOu50SocvKpUEw==
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -5913,11 +6526,21 @@ toml@^3.0.0:
   resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
   integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
 
+toposort@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
+  integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
+
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
+trough@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz#0f7b511a4fde65a46f18477ab38849b22c554876"
+  integrity sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==
+
 tsconfig-paths@^3.12.0, tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
@@ -5938,6 +6561,11 @@ tslib@^2.0.3, tslib@^2.3.0, tslib@^2.3.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
+tslib@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -6005,6 +6633,19 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
+unified@^10.0.0:
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.2.tgz#b1d64e55dafe1f0b98bb6c719881103ecf6c86df"
+  integrity sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    bail "^2.0.0"
+    extend "^3.0.0"
+    is-buffer "^2.0.0"
+    is-plain-obj "^4.0.0"
+    trough "^2.0.0"
+    vfile "^5.0.0"
+
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -6015,6 +6656,79 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^2.0.1"
 
+unist-builder@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-3.0.0.tgz#728baca4767c0e784e1e64bb44b5a5a753021a04"
+  integrity sha512-GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+
+unist-util-generated@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.0.tgz#86fafb77eb6ce9bfa6b663c3f5ad4f8e56a60113"
+  integrity sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw==
+
+unist-util-is@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.1.1.tgz#e8aece0b102fa9bc097b0fef8f870c496d4a6236"
+  integrity sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ==
+
+unist-util-position@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.3.tgz#5290547b014f6222dff95c48d5c3c13a88fadd07"
+  integrity sha512-p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+
+unist-util-stringify-position@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz#5c6aa07c90b1deffd9153be170dce628a869a447"
+  integrity sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==
+  dependencies:
+    "@types/unist" "^2.0.0"
+
+unist-util-visit-parents@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz#e83559a4ad7e6048a46b1bdb22614f2f3f4724f2"
+  integrity sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+
+unist-util-visit-parents@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.1.0.tgz#44bbc5d25f2411e7dfc5cecff12de43296aa8521"
+  integrity sha512-y+QVLcY5eR/YVpqDsLf/xh9R3Q2Y4HxkZTp7ViLDU6WtJCEcPmRzW1gpdWDCDIqIlhuPDXOgttqPlykrHYDekg==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+
+unist-util-visit@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-3.1.0.tgz#9420d285e1aee938c7d9acbafc8e160186dbaf7b"
+  integrity sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+    unist-util-visit-parents "^4.0.0"
+
+unist-util-visit@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.0.tgz#f41e407a9e94da31594e6b1c9811c51ab0b3d8f5"
+  integrity sha512-n7lyhFKJfVZ9MnKtqbsqkQEk5P1KShj0+//V7mAcoI6bpbUjh3C/OG8HVD+pBihfh6Ovl01m8dkcv9HNqYajmQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+    unist-util-visit-parents "^5.0.0"
+
+unload@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/unload/-/unload-2.2.0.tgz#ccc88fdcad345faa06a92039ec0f80b488880ef7"
+  integrity sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==
+  dependencies:
+    "@babel/runtime" "^7.6.2"
+    detect-node "^2.0.4"
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -6071,6 +6785,11 @@ use-callback-ref@^1.2.3, use-callback-ref@^1.2.5:
   resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.5.tgz#6115ed242cfbaed5915499c0a9842ca2912f38a5"
   integrity sha512-gN3vgMISAgacF7sqsLPByqoePooY3n2emTH59Ur5d/M8eg4WTWu1xp8i8DHjohftIyEx0S08RiYxbffr4j8Peg==
 
+use-debounce@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/use-debounce/-/use-debounce-7.0.1.tgz#380e6191cc13ad29f8e2149a12b5c37cc2891190"
+  integrity sha512-fOrzIw2wstbAJuv8PC9Vg4XgwyTLEOdq4y/Z3IhVl8DAE4svRcgyEUvrEXu+BMNgMoc3YND6qLT61kkgEKXh7Q==
+
 use-sidecar@^1.0.1, use-sidecar@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.5.tgz#ffff2a17c1df42e348624b699ba6e5c220527f2b"
@@ -6118,6 +6837,16 @@ uuid@^8.3.0, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uvu@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/uvu/-/uvu-0.5.3.tgz#3d83c5bc1230f153451877bfc7f4aea2392219ae"
+  integrity sha512-brFwqA3FXzilmtnIyJ+CxdkInkY/i4ErvP7uV0DnUVxQcQ55reuHphorpF+tZoVHK2MniZ/VJzI7zJQoc9T9Yw==
+  dependencies:
+    dequal "^2.0.0"
+    diff "^5.0.0"
+    kleur "^4.0.3"
+    sade "^1.7.3"
+
 v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -6136,6 +6865,24 @@ vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
+vfile-message@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.2.tgz#a2908f64d9e557315ec9d7ea3a910f658ac05f7d"
+  integrity sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-stringify-position "^3.0.0"
+
+vfile@^5.0.0:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.2.tgz#b499fbc50197ea50ad3749e9b60beb16ca5b7c54"
+  integrity sha512-w0PLIugRY3Crkgw89TeMvHCzqCs/zpreR31hl4D92y6SOE07+bfJe+dK5Q2akwS+i/c801kzjoOr9gMcTe6IAA==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    is-buffer "^2.0.0"
+    unist-util-stringify-position "^3.0.0"
+    vfile-message "^3.0.0"
+
 wbuf@^1.1.0, wbuf@^1.7.3:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
@@ -6344,3 +7091,16 @@ yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+yup@^0.32.11:
+  version "0.32.11"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5"
+  integrity sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==
+  dependencies:
+    "@babel/runtime" "^7.15.4"
+    "@types/lodash" "^4.14.175"
+    lodash "^4.17.21"
+    lodash-es "^4.17.21"
+    nanoclone "^0.2.1"
+    property-expr "^2.0.4"
+    toposort "^2.0.2"

From 4774b2f3bdf8cb87d71b106ee9dec0e75d93dbcb Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Wed, 11 May 2022 18:51:00 -0500
Subject: [PATCH 002/101] Fix parser error

---
 .../instructions/upgradeable_loader/types.ts  |  1 -
 helpers/parser.ts                             |  8 +++----
 helpers/programs/veHoney.ts                   | 10 ++++----
 helpers/sdk/constant.ts                       |  6 ++---
 hooks/tribeca/useExecutiveCouncil.ts          |  1 -
 hooks/tribeca/useGovernor.ts                  |  1 -
 hooks/useStake.tsx                            | 24 ++++++++-----------
 7 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/helpers/instructions/upgradeable_loader/types.ts b/helpers/instructions/upgradeable_loader/types.ts
index 8a40eae7..5d538769 100644
--- a/helpers/instructions/upgradeable_loader/types.ts
+++ b/helpers/instructions/upgradeable_loader/types.ts
@@ -176,7 +176,6 @@ export const UpgradeableLoaderAccount = coerce(
       case 'uninitialized': {
         return {
           type: value.type,
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           info: create(value.info, ProgramUninitializedAccountInfo)
         };
       }
diff --git a/helpers/parser.ts b/helpers/parser.ts
index 8271062d..bc41e88a 100644
--- a/helpers/parser.ts
+++ b/helpers/parser.ts
@@ -16,8 +16,8 @@ export const {
     useData: useParsedProposalMetas,
     useSingleData: useParsedProposalMeta
   },
-  locker: { useData: useParsedLockers, useSingleData: useParsedLocker },
-  escrow: { useData: useParsedEscrows, useSingleData: useParsedEscrow },
+  lockerV2: { useData: useParsedLockers, useSingleData: useParsedLocker },
+  escrowV2: { useData: useParsedEscrows, useSingleData: useParsedEscrow },
   governor: { useData: useParsedGovernors, useSingleData: useParsedGovernor },
   vote: { useData: useParsedVotes, useSingleData: useParsedVote },
   transaction: { useData: useParsedTXByKeys, useSingleData: useParsedTXByKey }
@@ -48,8 +48,8 @@ export const {
 } = makeProgramParserHooks(GOKI_CODERS.SmartWallet);
 
 export const {
-  escrow: { useSingleData: useEscrowData },
-  locker: { useSingleData: useLockerData }
+  escrowV2: { useSingleData: useEscrowData },
+  lockerV2: { useSingleData: useLockerData }
 } = makeProgramParserHooks(HONEY_DAO_CODERS.LockedVoter);
 
 export const {
diff --git a/helpers/programs/veHoney.ts b/helpers/programs/veHoney.ts
index 773c49b5..6a6eaea3 100644
--- a/helpers/programs/veHoney.ts
+++ b/helpers/programs/veHoney.ts
@@ -5,18 +5,18 @@ import type { VeHoney as VoterIDL } from '../types/ve_honey';
 export type LockedVoterTypes = AnchorTypes<
   VoterIDL,
   {
-    locker: LockerData;
-    escrow: EscrowData;
+    lockerV2: LockerV2Data;
+    escrowV2: EscrowV2Data;
     lockerWhitelistEntry: LockerWhitelistEntryData;
   }
 >;
 
 type Accounts = LockedVoterTypes['Accounts'];
-export type LockerData = Accounts['lockerV2'];
-export type EscrowData = Accounts['escrowV2'];
+export type LockerV2Data = Accounts['lockerV2'];
+export type EscrowV2Data = Accounts['escrowV2'];
 export type LockerWhitelistEntryData = Accounts['whitelistEntry'];
 
-export type LockerParams = LockedVoterTypes['Defined']['LockerParamsV2'];
+export type LockerParamsV2 = LockedVoterTypes['Defined']['LockerParamsV2'];
 
 export type LockedVoterError = LockedVoterTypes['Error'];
 export type LockedVoterProgram = LockedVoterTypes['Program'];
diff --git a/helpers/sdk/constant.ts b/helpers/sdk/constant.ts
index 697ecea7..5cc184c4 100644
--- a/helpers/sdk/constant.ts
+++ b/helpers/sdk/constant.ts
@@ -18,7 +18,7 @@ export const PHONEY_MINT = new PublicKey(
 );
 
 export const WHITELIST_ENTRY = new PublicKey(
-  'EAc9qa3DXCgBwSEjRkXGZxPUmvuNTV56zfYzbjihbiYv'
+  'G62oYbYUbchjHMRddcFaDqRQ5CuNV9KE36kfzyYvFuDy'
 );
 
 export const PHONEY_DECIMALS = 6;
@@ -26,7 +26,7 @@ export const PHONEY_DECIMALS = 6;
 // See `Anchor.toml` for all addresses.
 export const HONEY_DAO_ADDRESSES = {
   Govern: new PublicKey('Govz1VyoyLD5BL6CSCxUJLVLsQHRwjfFj1prNsdNg5Jw'),
-  LockedVoter: new PublicKey('5i6s4zbxYGDhY1UGNZwrtBUAp7u2fnJ8ZSXu39eZWjNT')
+  LockedVoter: new PublicKey(process.env.NEXT_PUBLIC_VOTE_PROGRAM_ID!)
 };
 
 /**
@@ -46,5 +46,5 @@ export const PROPOSAL_TITLE_MAX_LEN = 140;
 
 export const GOVERNOR_ADDRESS = new PublicKey(
   process.env.NEXT_PUBLIC_GOVERNOR_ADDRESS ||
-    'H8Vs8jXXXRW2JTcxhXb2bnngxvmHWdbmExVNjrj5YXvr'
+    'CSFk5VQwpQVs5tVXRLi5jtqJVkySAPxBxAQPD4W2mePa'
 );
diff --git a/hooks/tribeca/useExecutiveCouncil.ts b/hooks/tribeca/useExecutiveCouncil.ts
index 5a22a436..79bd833d 100644
--- a/hooks/tribeca/useExecutiveCouncil.ts
+++ b/hooks/tribeca/useExecutiveCouncil.ts
@@ -34,7 +34,6 @@ export const useExecutiveCouncil = () => {
       enabled: !!smartWalletData
     }
   );
-
   const { data: subaccountInfos } =
     useBatchedSubaccountInfos(subaccountInfoKeys);
 
diff --git a/hooks/tribeca/useGovernor.ts b/hooks/tribeca/useGovernor.ts
index f856d81e..b0c91a68 100644
--- a/hooks/tribeca/useGovernor.ts
+++ b/hooks/tribeca/useGovernor.ts
@@ -99,7 +99,6 @@ const useGovernorInner = (props: GovernorProps | undefined) => {
   const { data: lockerData } = useLockerData(
     governorData ? governorData.account.electorate : governorData
   );
-  console.log(lockerData);
   const { data: backupGovToken } = useToken(
     lockerData ? lockerData.account.tokenMint : lockerData
   );
diff --git a/hooks/useStake.tsx b/hooks/useStake.tsx
index 0b99fd22..e933c404 100644
--- a/hooks/useStake.tsx
+++ b/hooks/useStake.tsx
@@ -20,9 +20,12 @@ const checkErrorAndShowToast = (error: any, defaultToastMsg: string) => {
   if (errorMsg.includes('0x1')) {
     toastMsg = 'Insufficient balance';
   } else if (
-    errorMsg.includes('A voting escrow refresh cannot shorten the escrow time remaining.')
+    errorMsg.includes(
+      'A voting escrow refresh cannot shorten the escrow time remaining.'
+    )
   ) {
-    toastMsg = 'Selected vesting period cannot be shorter than the previously selected vesting period.';
+    toastMsg =
+      'Selected vesting period cannot be shorter than the previously selected vesting period.';
   } else {
     toastMsg = error.message;
   }
@@ -188,28 +191,21 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
     },
     [sc, vc, userKey, pHoneyToken]
   );
-  
+
   const lock = useCallback(
-    async(amount: BN, duration: BN, hasEscrow: boolean = true) => {
+    async (amount: BN, duration: BN, hasEscrow: boolean = true) => {
       if (sc && vc && userKey && honeyToken) {
         setIsLoading(true);
         try {
-          await vc.lock(
-            locker,
-            honeyToken.pubkey,
-            amount,
-            duration,
-            hasEscrow
-          );
+          await vc.lock(locker, honeyToken.pubkey, amount, duration, hasEscrow);
           toast.success('HONEY successfully vested');
           setIsLoading(false);
         } catch (e) {
           console.log(e);
-          checkErrorAndShowToast(e, "HONEY failed vesting")
+          checkErrorAndShowToast(e, 'HONEY failed vesting');
           // toast.error(`${e}`);
           setIsLoading(false);
         }
-
       }
     },
     [sc, vc, userKey, honeyToken]
@@ -223,7 +219,7 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
         setIsLoading(false);
       } catch (e) {
         console.log(e);
-        checkErrorAndShowToast(e, "Error unlocking")
+        checkErrorAndShowToast(e, 'Error unlocking');
         setIsLoading(false);
       }
     }

From 5d5d66907ee5db5ba4a6ed593add72b9c83c910a Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Fri, 13 May 2022 07:35:46 -0500
Subject: [PATCH 003/101] Update programs

---
 components/HelperCard.tsx                     |  8 +++++
 components/Modal/ModalInner.tsx               | 24 +++++--------
 components/Modal/index.tsx                    | 10 +++---
 .../ProposalConfirmationModal/ProposalIX.tsx  |  7 ++--
 .../ProposalConfirmationModal/index.tsx       | 34 +++++++++++++------
 .../locked-voter/ProposalTXForm.tsx           |  4 ++-
 6 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/components/HelperCard.tsx b/components/HelperCard.tsx
index cb2d1c17..ce39dff7 100644
--- a/components/HelperCard.tsx
+++ b/components/HelperCard.tsx
@@ -24,6 +24,14 @@ export const HelperCard: React.FC<Props> = ({
       paddingY="2"
       borderWidth="1"
       fontSize="small"
+      // backgroundColor="accent"
+      borderRadius="medium"
+      borderColor="green"
+      borderTopWidth="px"
+      borderLeftWidth="px"
+      borderRightWidth="px"
+      borderBottomWidth="px"
+      opacity="50"
       className={className}
     >
       {children}
diff --git a/components/Modal/ModalInner.tsx b/components/Modal/ModalInner.tsx
index 436b7f9b..ab670346 100644
--- a/components/Modal/ModalInner.tsx
+++ b/components/Modal/ModalInner.tsx
@@ -2,7 +2,7 @@ import { Box, Button, IconClose } from 'degen';
 import { useModal } from './context';
 
 interface Props {
-  title: string;
+  title: React.ReactNode;
   children?: React.ReactNode;
   buttonProps?: React.ComponentProps<typeof Button>;
   className?: string;
@@ -19,25 +19,17 @@ export const ModalInner: React.FC<Props> = ({
     <>
       <Box
         position="relative"
-        fontWeight="bold"
         textAlign="center"
-        paddingY="4"
-        // tw="relative border-b dark:border-b-warmGray-800 dark:text-white font-bold text-base text-center py-4"
+        paddingY="5"
+        borderBottomWidth="px"
+        borderColor="groupBackground"
       >
-        <Box
-          paddingX="8"
-          overflow="hidden"
-          whiteSpace="nowrap"
-          // tw="px-8 overflow-ellipsis overflow-hidden whitespace-nowrap"
-        >
+        <Box paddingX="8" overflow="hidden" whiteSpace="nowrap">
           {title}
         </Box>
-        <Box position="absolute" display="flex" right="4" top="0">
-          <Button
-            onClick={() => close()}
-            // tw="absolute right-4 h-full flex items-center top-0 text-warmGray-600 hover:text-warmGray-200 transition-colors"
-          >
-            <IconClose />
+        <Box position="absolute" display="flex" right="4" top="2">
+          <Button variant="transparent" onClick={close}>
+            <IconClose color="accent" />
           </Button>
         </Box>
       </Box>
diff --git a/components/Modal/index.tsx b/components/Modal/index.tsx
index 50f47672..ea5b6016 100644
--- a/components/Modal/index.tsx
+++ b/components/Modal/index.tsx
@@ -1,5 +1,3 @@
-import '@reach/dialog/styles.css';
-
 import { css } from '@emotion/react';
 import styled from '@emotion/styled';
 import { DialogContent, DialogOverlay } from '@reach/dialog';
@@ -7,9 +5,10 @@ import { animated, useSpring, useTransition } from '@react-spring/web';
 import React from 'react';
 import { isMobile } from 'react-device-detect';
 import { useGesture } from 'react-use-gesture';
-
 import { ModalProvider } from './context';
 
+import '@reach/dialog/styles.css';
+
 export interface ModalProps {
   children: React.ReactNode;
   isOpen: boolean;
@@ -84,7 +83,10 @@ export const Modal: React.FC<ModalProps> = ({
   );
 };
 
-const ModalWrapper = styled(animated(DialogContent))``;
+const ModalWrapper = styled(animated(DialogContent))`
+  background: rgb(24, 24, 24);
+  border-radius: 0.5rem;
+`;
 
 // const ModalWrapper = styled(animated(DialogContent))`
 //   ${tw`shadow-2xl w-full max-w-lg p-6 rounded-lg relative`}
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
index da20620e..86f3993e 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
@@ -1,5 +1,5 @@
 import type { TransactionInstruction } from '@solana/web3.js';
-import { Box } from 'degen';
+import { Box, Text } from 'degen';
 
 import { useParsedInstruction } from 'hooks/useParsedInstruction';
 
@@ -16,8 +16,11 @@ export const ProposalIX: React.FC<Props> = ({ ix }: Props) => {
       paddingY="2"
       fontSize="small"
       fontWeight="semiBold"
+      width="fit"
     >
-      {parsedIX.title}
+      <Text as="span" color="orange">
+        {parsedIX.title}
+      </Text>
     </Box>
   );
 };
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
index a676cf65..c68df1f0 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
@@ -69,7 +69,11 @@ export const ProposalConfirmModal: React.FC<Props> = ({
       {...modalProps}
     >
       <ModalInner
-        title={`Proposal: ${proposal.title}`}
+        title={
+          <Text variant="large" ellipsis>
+            Proposal: {proposal.title}
+          </Text>
+        }
         buttonProps={{
           disabled: !tribecaMut,
           variant: 'primary',
@@ -79,9 +83,11 @@ export const ProposalConfirmModal: React.FC<Props> = ({
       >
         <Box display="grid" paddingY="4" gap="4">
           <HelperCard>
-            <Box as="p" marginBottom="1">
-              Tip: The proposal cannot be modified after submission, so please
-              verify all information before submitting.
+            <Box marginBottom="1">
+              <Text as="p">
+                Tip: The proposal cannot be modified after submission, so please
+                verify all information before submitting.
+              </Text>
             </Box>
             <Text as="p">
               Once submitted, anyone with at least{' '}
@@ -90,11 +96,11 @@ export const ProposalConfirmModal: React.FC<Props> = ({
               immediately begin and last for {votingPeriodFmt}.
             </Text>
           </HelperCard>
-          <Text>
-            <div>
+          <Box>
+            <Text>
               <ReactMarkdown>{proposal.description}</ReactMarkdown>
-            </div>
-          </Text>
+            </Text>
+          </Box>
           <Box display="flex" flexDirection="column" gap="1.5">
             {proposal.instructions.map((ix, i) => (
               <ProposalIX key={i} ix={ix} />
@@ -113,8 +119,16 @@ export const ProposalConfirmModal: React.FC<Props> = ({
               target="_blank"
               rel="noreferrer"
             >
-              <span>Preview on Anchor.so</span>
-              <IconLink />
+              <Box
+                display="flex"
+                alignItems="center"
+                gap="2"
+                color={{ base: 'green', hover: 'white' }}
+                fontSize="small"
+              >
+                <span>Preview on Anchor.so</span>
+                <IconLink size="5" />
+              </Box>
             </a>
           )}
         </Box>
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
index 93942d3f..3e828088 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
@@ -80,7 +80,9 @@ export const ProposalTXForm: React.FC<Props> = ({
       {currentAction && (
         <>
           {currentAction.description && (
-            <HelperCard>{currentAction.description}</HelperCard>
+            <HelperCard>
+              <Text>{currentAction.description}</Text>
+            </HelperCard>
           )}
           <currentAction.Renderer
             actor={actor}

From 460d75cf8052fef25a69c63b2bc5220902a06b79 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Fri, 13 May 2022 19:46:05 -0500
Subject: [PATCH 004/101] Add proposal view page

---
 actions/RawTX.tsx                             |   8 +-
 components/Modal/ModalButton.tsx              |  11 +-
 .../ProposalConfirmationModal/index.tsx       |   6 +-
 .../locked-voter/ProposalCreateInner.tsx      |   2 +-
 .../locked-voter/ProposalTXForm.tsx           |   2 +-
 .../Proposals/ProposalIndexView/index.tsx     |   6 +
 .../CastVoteButton/CastVoteModal.tsx          |  81 +++++++
 .../CastVoteButton/VoteResult.tsx             |  99 +++++++++
 .../CastVoteButton/VoteSelectContents.tsx     | 161 ++++++++++++++
 .../locked-voter/CastVoteButton/index.tsx     |  34 +++
 .../EmbedTX/InstructionPreview.tsx            |  63 ++++++
 .../EmbedTX/InstructionsInner.tsx             |  18 ++
 .../locked-voter/EmbedTX/index.tsx            |  27 +++
 .../ProposalBody/GitHubComments.tsx           |  71 ++++++
 .../locked-voter/ProposalBody/index.tsx       |  34 +++
 .../locked-voter/ProposalDetails.tsx          |  60 +++++
 .../locked-voter/ProposalHelmet.tsx           |  52 +++++
 .../locked-voter/ProposalHistory.tsx          | 132 +++++++++++
 .../locked-voter/VotesCard.tsx                |  80 +++++++
 .../locked-voter/actions/ProposalActivate.tsx | 175 +++++++++++++++
 .../locked-voter/actions/ProposalExecute.tsx  | 177 +++++++++++++++
 .../locked-voter/actions/ProposalQueue.tsx    |  60 +++++
 .../locked-voter/actions/ProposalVote.tsx     | 147 ++++++++++++
 .../ProposalIndexView/locked-voter/github.ts  |  41 ++++
 .../ProposalIndexView/locked-voter/index.tsx  | 126 +++++++++++
 .../Proposals/ProposalsList/ProposalCard.tsx  | 104 +++++----
 .../ProposalsList/ProposalStateDate.tsx       |  40 ++--
 .../ProposalsList/ProposalStateLabel.tsx      |  47 ++--
 components/{ => common}/HelperCard.tsx        |   0
 components/common/governance/Card.tsx         | 108 +++++++++
 .../common/governance/GovernancePage.tsx      |  35 +++
 .../common/governance/GovernancePageInner.tsx | 136 ++++++++++++
 components/common/governance/Meter.tsx        |  42 ++++
 components/common/governance/Profile.tsx      |  86 +++++++
 helpers/utils.ts                              |  23 ++
 hooks/tribeca/useEscrow.ts                    |   2 +-
 hooks/useParsedTX.ts                          |  85 +++++++
 hooks/useSmartWallet.ts                       | 209 ++++++++++++++++++
 hooks/useTXAddress.ts                         |  13 ++
 .../proposals/[proposalIndex]/index.tsx       |  13 ++
 pages/governance/proposals/index.tsx          |   2 +-
 41 files changed, 2514 insertions(+), 104 deletions(-)
 create mode 100644 components/Proposals/ProposalIndexView/index.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/ProposalBody/index.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/github.ts
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/index.tsx
 rename components/{ => common}/HelperCard.tsx (100%)
 create mode 100644 components/common/governance/Card.tsx
 create mode 100644 components/common/governance/GovernancePage.tsx
 create mode 100644 components/common/governance/GovernancePageInner.tsx
 create mode 100644 components/common/governance/Meter.tsx
 create mode 100644 components/common/governance/Profile.tsx
 create mode 100644 hooks/useParsedTX.ts
 create mode 100644 hooks/useSmartWallet.ts
 create mode 100644 hooks/useTXAddress.ts
 create mode 100644 pages/governance/proposals/[proposalIndex]/index.tsx

diff --git a/actions/RawTX.tsx b/actions/RawTX.tsx
index 5d8d5494..f541b14a 100644
--- a/actions/RawTX.tsx
+++ b/actions/RawTX.tsx
@@ -2,7 +2,7 @@ import { extractErrorMessage } from '@saberhq/sail';
 import { Transaction } from '@solana/web3.js';
 import { Box, Text, Textarea } from 'degen';
 
-import { HelperCard } from 'components/HelperCard';
+import { HelperCard } from 'components/common/HelperCard';
 import type { ActionFormProps } from './types';
 
 export const RawTX: React.FC<ActionFormProps> = ({
@@ -13,7 +13,7 @@ export const RawTX: React.FC<ActionFormProps> = ({
   return (
     <>
       <HelperCard variant="warn">
-        <Text size="headingTwo">
+        <Text as="p" size="base" color="yellow">
           Warning: this page is for advanced users only. Invalid transaction
           data may cause this page to freeze. Documentation will be coming soon.
         </Text>
@@ -22,10 +22,10 @@ export const RawTX: React.FC<ActionFormProps> = ({
         <Box
         // tw="prose prose-sm prose-light"
         >
-          <p>
+          <Text as="p">
             This page allows proposing any arbitrary transaction for execution
             by the DAO. The fee payer and recent blockhash will not be used.
-          </p>
+          </Text>
         </Box>
       </HelperCard>
       <Textarea
diff --git a/components/Modal/ModalButton.tsx b/components/Modal/ModalButton.tsx
index 7786ee3f..0e37c13f 100644
--- a/components/Modal/ModalButton.tsx
+++ b/components/Modal/ModalButton.tsx
@@ -1,7 +1,6 @@
-import { useState } from "react";
-
-import { Button } from "../Button";
-import { Modal } from ".";
+import { Button } from 'degen';
+import { useState } from 'react';
+import { Modal } from '.';
 
 type Props = {
   buttonLabel: string;
@@ -16,13 +15,13 @@ export const ModalButton: React.FC<Props> = ({
   buttonProps,
   children,
   className,
-  onDismiss,
+  onDismiss
 }: Props) => {
   const [showModal, setShowModal] = useState<boolean>(false);
   return (
     <>
       <Modal
-        tw="p-0"
+        // tw="p-0"
         isOpen={showModal}
         onDismiss={() => {
           onDismiss?.();
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
index c68df1f0..a26d128c 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
@@ -5,17 +5,17 @@ import type { TransactionInstruction } from '@solana/web3.js';
 import { GovernorWrapper } from '@tribecahq/tribeca-sdk';
 import ReactMarkdown from 'react-markdown';
 import invariant from 'tiny-invariant';
+import { useRouter } from 'next/router';
+import { Box, IconLink, Text } from 'degen';
 
 import { useSDK } from 'helpers/sdk';
 import { useGovernor, useGovernorParams } from 'hooks/tribeca/useGovernor';
 // import { notify } from '../../../../../../../utils/notifications';
-import { HelperCard } from 'components/HelperCard';
+import { HelperCard } from 'components/common/HelperCard';
 import type { ModalProps } from 'components/Modal';
 import { Modal } from 'components/Modal';
 import { ModalInner } from 'components/Modal/ModalInner';
 import { ProposalIX } from './ProposalIX';
-import { useRouter } from 'next/router';
-import { Box, IconLink, Text } from 'degen';
 
 type Props = Omit<ModalProps, 'children'> & {
   proposal: {
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
index 83fde3f0..9b677e16 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -17,7 +17,7 @@ import { useGovernor } from 'hooks/tribeca/useGovernor';
 // import { LabeledInput } from '../../../../../common/inputs/LabeledInput';
 import { ProposalConfirmModal } from './ProposalConfirmationModal';
 import { ProposalTXForm } from './ProposalTXForm';
-import { HelperCard } from 'components/HelperCard';
+import { HelperCard } from 'components/common/HelperCard';
 import { Box, Button, Card, Heading, Input, Textarea, Text } from 'degen';
 import { AsyncButton } from 'components/AsyncButton';
 
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
index 3e828088..c09d95ce 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
@@ -4,7 +4,7 @@ import type { ActionType } from 'actions/types';
 import { ACTIONS } from 'actions/types';
 import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
 import { useGovernor } from 'hooks/tribeca/useGovernor';
-import { HelperCard } from 'components/HelperCard';
+import { HelperCard } from 'components/common/HelperCard';
 import { Box, Field, Spinner, Text } from 'degen';
 // import { Select } from '../../../../../common/inputs/InputText';
 // import { LoadingPage } from '../../../../../common/LoadingPage';
diff --git a/components/Proposals/ProposalIndexView/index.tsx b/components/Proposals/ProposalIndexView/index.tsx
new file mode 100644
index 00000000..aebe5703
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/index.tsx
@@ -0,0 +1,6 @@
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { ProposalIndexView as LockedVoter } from './locked-voter';
+
+export const ProposalIndexView: React.FC = () => {
+  return <LockedVoter />;
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
new file mode 100644
index 00000000..b276a848
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
@@ -0,0 +1,81 @@
+import { useSail } from '@saberhq/sail';
+import { createMemoInstruction } from '@saberhq/solana-contrib';
+import type { VoteSide } from '@tribecahq/tribeca-sdk';
+import { useState } from 'react';
+import invariant from 'tiny-invariant';
+
+import { useSDK } from 'helpers/sdk';
+import { useUserEscrow } from 'hooks/tribeca/useEscrow';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { useVote } from 'hooks/tribeca/useVote';
+import { ModalInner } from 'components/Modal/ModalInner';
+import { VOTE_SIDE_LABEL } from '../VotesCard';
+import { VoteResult } from './VoteResult';
+import { VoteSelectContents } from './VoteSelectContents';
+
+interface Props {
+  proposalInfo: ProposalInfo;
+}
+
+export const CastVoteModal: React.FC<Props> = ({ proposalInfo }: Props) => {
+  const { data: escrow } = useUserEscrow();
+  const { handleTX } = useSail();
+  const { sdkMut } = useSDK();
+  const { data: myVote } = useVote(
+    proposalInfo.proposalKey,
+    sdkMut?.provider.wallet.publicKey
+  );
+
+  const [side, setSide] = useState<VoteSide | null>(
+    myVote?.accountInfo.data.side ?? null
+  );
+  const [reason, setReason] = useState<string>('');
+  const [hasVoted, setHasVoted] = useState<boolean>(false);
+
+  const vote = async () => {
+    invariant(escrow && side);
+    const tx = await escrow.escrowW.castVote({
+      proposal: proposalInfo.proposalKey,
+      side
+    });
+    const memoIX = createMemoInstruction(reason, [
+      escrow.escrowW.provider.wallet.publicKey
+    ]);
+    tx.addInstructions(memoIX);
+    const { pending } = await handleTX(tx, `Vote ${VOTE_SIDE_LABEL[side]}`);
+    if (!pending) {
+      return;
+    }
+    await pending.wait();
+    setHasVoted(true);
+  };
+
+  if (side && hasVoted) {
+    return (
+      <VoteResult side={side} proposalInfo={proposalInfo} reason={reason} />
+    );
+  }
+
+  return (
+    <ModalInner
+      title="Cast Vote"
+      // tw="px-6 max-w-md"
+      buttonProps={{
+        disabled: !(side && escrow),
+        onClick: vote,
+        variant: 'primary',
+        children: side
+          ? `Cast ${VOTE_SIDE_LABEL[side]} Vote`
+          : 'Select a Vote Side'
+      }}
+    >
+      <VoteSelectContents
+        proposal={proposalInfo}
+        side={side}
+        setSide={setSide}
+        reason={reason}
+        setReason={setReason}
+      />
+    </ModalInner>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx
new file mode 100644
index 00000000..574ddcc5
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx
@@ -0,0 +1,99 @@
+import { VoteSide } from '@tribecahq/tribeca-sdk';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+// import { Button } from '../../../../../../common/Button';
+import { ModalInner } from 'components/Modal/ModalInner';
+import { VOTE_SIDE_LABEL } from '../VotesCard';
+import { Box, Stack, Text } from 'degen';
+
+interface Props {
+  proposalInfo: ProposalInfo;
+  side: VoteSide;
+  reason: string | null;
+}
+
+const formatTweet = ({
+  daoName,
+  proposal,
+  side,
+  reason
+}: {
+  daoName: string;
+  proposal: ProposalInfo;
+  side: VoteSide;
+  reason: string | null;
+}) =>
+  [
+    `I ${
+      side !== VoteSide.Abstain
+        ? `voted ${VOTE_SIDE_LABEL[side].toLowerCase()}`
+        : `abstained from voting on`
+    } ${daoName} Proposal #${proposal.index}${
+      proposal.proposalMetaData?.title
+        ? `: ${proposal.proposalMetaData.title}`
+        : ''
+    }`,
+    reason,
+    `Vote here: ${window.location.href}`
+  ]
+    .filter(s => !!s)
+    .join('\n\n');
+
+export const VoteResult: React.FC<Props> = ({
+  proposalInfo,
+  side,
+  reason
+}: Props) => {
+  return (
+    <ModalInner
+      title="Vote Confirmed"
+      // tw="px-6 max-w-md"
+    >
+      <Stack align="center">
+        <Box
+          display="flex"
+          flexDirection="column"
+          alignItems="center"
+          maxWidth="screenSm"
+          gap="3"
+        >
+          <Text as="h2" size="large" color="white" weight="semiBold">
+            You{' '}
+            {side !== VoteSide.Abstain
+              ? `voted ${VOTE_SIDE_LABEL[side].toLowerCase()}`
+              : `abstained from voting on`}
+            <br />
+            {proposalInfo.proposalMetaData?.title ??
+              `Proposal #${proposalInfo.index}`}
+          </Text>
+          <Text as="p" size="small">
+            Help spread the word for your
+            <br />
+            choice to win the vote:
+          </Text>
+        </Box>
+        {/* <div tw="mt-8">
+          {daoName && (
+            <a
+              target="_blank"
+              href={`https://twitter.com/intent/tweet?text=${encodeURIComponent(
+                formatTweet({
+                  daoName,
+                  proposal: proposalInfo,
+                  side,
+                  reason
+                })
+              )}`}
+              rel="noreferrer"
+            >
+              <Button variant="primary" size="md">
+                Tweet your {side === VoteSide.For ? 'support' : 'stance'}
+              </Button>
+            </a>
+          )}
+        </div> */}
+      </Stack>
+    </ModalInner>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx
new file mode 100644
index 00000000..612a0ed4
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx
@@ -0,0 +1,161 @@
+import { Box, Button, Text, Textarea } from 'degen';
+import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { sum } from 'lodash';
+import invariant from 'tiny-invariant';
+
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { FORMAT_VOTE_PERCENT } from 'helpers/format';
+import { HelperCard } from 'components/common/HelperCard';
+import { sideColor } from 'helpers/utils';
+import { VOTE_SIDE_LABEL } from '../VotesCard';
+import { Meter } from 'components/common/governance/Meter';
+
+interface Props {
+  proposal: ProposalInfo;
+
+  side: VoteSide | null;
+  setSide: (side: VoteSide) => void;
+  reason: string;
+  setReason: (reason: string) => void;
+}
+
+export const VoteSelectContents: React.FC<Props> = ({
+  proposal,
+  side,
+  setSide,
+  reason,
+  setReason
+}: Props) => {
+  const allVotes = (['forVotes', 'againstVotes', 'abstainVotes'] as const).map(
+    vote => proposal.proposalData[vote].toNumber()
+  );
+  const totalVotes = sum(allVotes);
+  return (
+    <Box display="grid" gap="4">
+      <Box display="flex" flexDirection="column" alignItems="center">
+        <Text as="h2" color="white" weight="semiBold">
+          Your Ballot for Proposal #{proposal.index}
+        </Text>
+      </Box>
+      <HelperCard variant="muted">
+        <Text as="p">Select one of the options below to cast your vote.</Text>
+      </HelperCard>
+      <Box display="flex" flexDirection="column" gap="4" width="full">
+        {([VoteSide.For, VoteSide.Against, VoteSide.Abstain] as const).map(
+          (voteSide, i) => {
+            const myVotes = allVotes[i];
+            invariant(typeof myVotes === 'number');
+            const percent = FORMAT_VOTE_PERCENT.format(
+              totalVotes === 0 ? 0 : myVotes / totalVotes
+            );
+            return (
+              <Button
+                // tw="flex items-center gap-4 px-5 py-4 border rounded border-warmGray-600 transition-all"
+                key={voteSide}
+                // css={[
+                //   side === voteSide && {
+                //     borderColor: sideColor(voteSide)
+                //   }
+                // ]}
+                onClick={() => setSide(voteSide)}
+              >
+                <Box>
+                  <Box
+                    width="6"
+                    height="6"
+                    // css={[tw`border border-gray-500`, tw`w-6 h-6`]}
+                  >
+                    <svg
+                      // tw="w-full h-full"
+                      // css={[
+                      //   css`
+                      //     stroke-width: 15px;
+                      //     fill: none;
+                      //     & > path {
+                      //       stroke: ${sideColor(voteSide)};
+                      //     }
+                      //   `,
+                      //   side === voteSide &&
+                      //     css`
+                      //       & > path {
+                      //         stroke-dashoffset: 0;
+                      //         transition: stroke-dashoffset 0.1s ease-in 0s;
+                      //       }
+                      //     `
+                      // ]}
+                      viewBox="0 0 100 100"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      {voteSide === VoteSide.For ? (
+                        <path
+                          d="M 10 50 L 40 86 L 90 10"
+                          strokeDasharray="140"
+                          strokeDashoffset="140"
+                        ></path>
+                      ) : (
+                        <>
+                          <path
+                            d="M 10 10 L 90 90"
+                            strokeDasharray="113"
+                            strokeDashoffset="113"
+                          ></path>
+                          <path
+                            d="M 90 10 L 10 90"
+                            strokeDasharray="113"
+                            strokeDashoffset="113"
+                          ></path>
+                        </>
+                      )}
+                    </svg>
+                  </Box>
+                </Box>
+                <Box display="flex" flexDirection="column" flexGrow={1}>
+                  <Box
+                    width="full"
+                    display="flex"
+                    alignItems="center"
+                    justifyContent="center"
+                  >
+                    <Box color="white" fontWeight="medium">
+                      {VOTE_SIDE_LABEL[voteSide]}
+                    </Box>
+                    <Box fontWeight="medium" color="accentText">
+                      {percent}
+                    </Box>
+                  </Box>
+                  <Meter
+                    value={myVotes}
+                    max={totalVotes === 0 ? 1 : totalVotes}
+                    barColor={sideColor(voteSide)}
+                  />
+                </Box>
+              </Button>
+            );
+          }
+        )}
+      </Box>
+      <Box marginTop="8">
+        {/* <label htmlFor="reason" tw="flex flex-col gap-2"> */}
+        {/* <span tw="font-medium text-white text-sm">
+            Add Reason (max 200 characters)
+          </span> */}
+        <Textarea
+          id="reason"
+          label={
+            <Text as="span" color="white" size="small" weight="medium">
+              Add reason (max 200 characters)
+            </Text>
+          }
+          hideLabel
+          // tw="resize-none h-auto"
+          maxLength={200}
+          placeholder="Tell others why you are voting this way"
+          rows={4}
+          value={reason}
+          onChange={e => setReason(e.target.value)}
+        />
+        {/* </label> */}
+      </Box>
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
new file mode 100644
index 00000000..47ef4849
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
@@ -0,0 +1,34 @@
+import { VoteSide } from '@tribecahq/tribeca-sdk';
+
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { ModalButton } from 'components/Modal/ModalButton';
+import { CastVoteModal } from './CastVoteModal';
+
+interface Props {
+  proposalInfo: ProposalInfo;
+  side: VoteSide | null;
+}
+
+export const CastVoteButton: React.FC<Props> = ({
+  proposalInfo,
+  side
+}: Props) => {
+  return (
+    <ModalButton
+      // tw="max-w-md"
+      buttonProps={{
+        variant: 'outline'
+        // css: tw`border-white w-2/5 hover:(border-primary bg-primary bg-opacity-20)`
+      }}
+      buttonLabel={
+        side === null // Vote account not yet created
+          ? 'Cast Vote'
+          : side === VoteSide.Pending
+          ? 'Cast Vote'
+          : 'Change Vote'
+      }
+    >
+      <CastVoteModal proposalInfo={proposalInfo} />
+    </ModalButton>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx
new file mode 100644
index 00000000..f8f06105
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx
@@ -0,0 +1,63 @@
+import { startCase } from 'lodash';
+
+import { useParsedInstruction } from 'hooks/useParsedInstruction';
+import type { ParsedInstruction } from 'hooks/useSmartWallet';
+import { shortenAddress } from 'helpers/utils';
+// import { AddressLink } from 'components/common/AddressLink';
+// import { InstructionDisplay } from '../../../../../wallet/tx/TransactionView/TransactionIndexView/InstructionDisplay';
+import { Box, Text } from 'degen';
+
+interface Props {
+  index: number;
+  instruction: ParsedInstruction;
+}
+
+export const InstructionPreview: React.FC<Props> = ({
+  instruction,
+  index
+}: Props) => {
+  const parsed = useParsedInstruction(instruction.ix);
+  return (
+    <Box
+      display="grid"
+      borderRadius="medium"
+      borderWidth="px"
+      // tw="grid border dark:border-warmGray-700 rounded"
+    >
+      <Box fontSize="small" padding="4">
+        <Text
+          as="h2"
+          weight="semiBold"
+          // tw="font-semibold text-gray-800 dark:text-white mb-2"
+        >
+          IX #{index + 1}:{' '}
+          {parsed?.title ??
+            startCase(
+              (instruction.parsed && 'name' in instruction.parsed
+                ? instruction.parsed.name
+                : null) ?? 'Unknown'
+            )}
+        </Text>
+        <Text as="p" size="small">
+          <Text as="span" weight="medium">
+            Program:
+          </Text>{' '}
+          {/* <AddressLink
+            tw="font-semibold text-secondary"
+            address={instruction.ix.programId}
+          >
+            {instruction.programName} (
+            {shortenAddress(instruction.ix.programId.toString())})
+          </AddressLink> */}
+        </Text>
+      </Box>
+      <Box
+        padding="4"
+        borderTopWidth="px"
+        // tw="p-4 border-t dark:border-t-warmGray-600"
+      >
+        {/* <InstructionDisplay parsed={parsed} instruction={instruction} /> */}
+      </Box>
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx
new file mode 100644
index 00000000..3e5b0be9
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx
@@ -0,0 +1,18 @@
+import { Box } from 'degen';
+// import { useTransaction } from '../../../../../wallet/tx/TransactionView/context';
+import { InstructionPreview } from './InstructionPreview';
+
+export const InstructionsInner: React.FC = () => {
+  // const { instructions } = useTransaction();
+  return (
+    <Box display="grid" gap="4">
+      {/* {instructions?.map((instruction, i) => (
+        <InstructionPreview
+          key={`ix_${i}`}
+          instruction={instruction}
+          index={i}
+        />
+      ))} */}
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx
new file mode 100644
index 00000000..c8aa8ae2
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx
@@ -0,0 +1,27 @@
+import type { PublicKey } from '@solana/web3.js';
+import { Box, Spinner } from 'degen';
+
+import { useParsedTXByKey } from 'hooks/useParsedTX';
+import { SmartWalletProvider } from 'hooks/useSmartWallet';
+// import { TransactionProvider } from '../../../../../wallet/tx/TransactionView/context';
+import { InstructionsInner } from './InstructionsInner';
+
+interface Props {
+  txKey: PublicKey;
+}
+
+export const EmbedTX: React.FC<Props> = ({ txKey }: Props) => {
+  const { data: parsedTX, isLoading } = useParsedTXByKey(txKey);
+  return (
+    <Box paddingY="6">
+      {isLoading && !parsedTX && <Spinner />}
+      {parsedTX && (
+        <SmartWalletProvider initialState={parsedTX.tx.account.smartWallet}>
+          {/* <TransactionProvider initialState={parsedTX}>
+            <InstructionsInner />
+          </TransactionProvider> */}
+        </SmartWalletProvider>
+      )}
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx
new file mode 100644
index 00000000..134797a1
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx
@@ -0,0 +1,71 @@
+import { Box, Stack, Text } from 'degen';
+import formatDistance from 'date-fns/formatDistance';
+
+import { Card } from 'components/common/governance/Card';
+// import { ProseSmall } from 'components/common/typography/Prose';
+import type { GitHubIssue } from '../github';
+import { useGitHubIssueComments } from '../github';
+
+interface Props {
+  issue: GitHubIssue;
+}
+
+export const GitHubComments: React.FC<Props> = ({ issue }: Props) => {
+  const { data: githubComments } = useGitHubIssueComments(issue.comments_url);
+  return (
+    <Card title={`Comments (${issue.comments})`} padded>
+      {/* <ProseSmall> */}
+      <Stack space="4">
+        {githubComments?.map(comment => (
+          <Box key={comment.id} display="flex" width="full" gap="4">
+            <img
+              src={comment.user?.avatar_url ?? ''}
+              tw="w-8 h-8 rounded-full"
+              alt={`Profile of ${comment.user?.login ?? ''}`}
+            />
+            <Box
+              flex={1}
+              display="flex"
+              borderWidth="px"
+              borderRadius="large"
+              // tw="border rounded-lg border-warmGray-700 flex-1"
+            >
+              <Box
+                paddingX="4"
+                paddingY="2"
+                borderBottomWidth="px"
+                borderTopRadius="large"
+                // tw="px-4 py-2 bg-warmGray-800 border-b border-b-warmGray-700 rounded-t-lg"
+              >
+                <a
+                  href={comment.user?.html_url}
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  {comment.user?.login}
+                </a>{' '}
+                <Text as="span">
+                  commented{' '}
+                  {formatDistance(new Date(comment.created_at), new Date(), {
+                    addSuffix: true
+                  })}
+                </Text>
+              </Box>
+              <Box paddingX="5" paddingY="3">
+                {comment.body}
+              </Box>
+            </Box>
+          </Box>
+        ))}
+      </Stack>
+      <div tw="w-full text-center py-8">
+        Got something to say? Add a comment to the{' '}
+        <a href={issue.html_url} target="_blank" rel="noreferrer">
+          proposal on GitHub
+        </a>
+        .
+      </div>
+      {/* </ProseSmall> */}
+    </Card>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/index.tsx
new file mode 100644
index 00000000..07d83817
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/index.tsx
@@ -0,0 +1,34 @@
+import { Box } from 'degen';
+import ReactMarkdown from 'react-markdown';
+
+// import { Prose } from '../../../../../../common/typography/Prose';
+import type { GitHubIssue } from '../github';
+
+interface Props {
+  description: string;
+  issue?: GitHubIssue | null;
+}
+
+export const ProposalBody: React.FC<Props> = ({
+  description,
+  issue
+}: Props) => {
+  return (
+    <Box as="article" color="text">
+      {/* <Prose> */}
+      {issue && (
+        <Box
+          paddingBottom="8"
+          marginBottom="8"
+          borderBottomWidth="px"
+          color="text"
+          // tw="border-b border-b-gray-700 pb-8 mb-8"
+        >
+          <ReactMarkdown linkTarget="_blank">{issue.body ?? ''}</ReactMarkdown>
+        </Box>
+      )}
+      <ReactMarkdown linkTarget="_blank">{description}</ReactMarkdown>
+      {/* </Prose> */}
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx
new file mode 100644
index 00000000..58a434b4
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx
@@ -0,0 +1,60 @@
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { Card } from 'components/common/governance/Card';
+// import { IXSummary } from '../../../../../common/governance/IXSummary';
+// import { TransactionPreviewLink } from '../../../../../common/governance/TransactionPreviewLink';
+import { extractGitHubIssueURL, useGitHubIssue } from './github';
+import { ProposalBody } from './ProposalBody';
+import { GitHubComments } from './ProposalBody/GitHubComments';
+import { Box, Text } from 'degen';
+
+interface Props {
+  className?: string;
+  proposalInfo?: ProposalInfo | null;
+}
+
+export const ProposalDetails: React.FC<Props> = ({
+  className,
+  proposalInfo
+}: Props) => {
+  const description = proposalInfo?.proposalMetaData?.descriptionLink ?? '';
+
+  const issueURL = extractGitHubIssueURL(description);
+  const { data: githubIssue } = useGitHubIssue(issueURL);
+
+  return (
+    <>
+      <Card className={className} title="Details">
+        <Box>
+          {proposalInfo?.proposalData.instructions.map((ix, i) => (
+            <Box
+              key={i}
+              display="flex"
+              paddingX="7"
+              paddingY="5"
+              borderBottomWidth="px"
+              // tw="px-7 py-5 border-b border-warmGray-800 flex"
+            >
+              <Text weight="medium">{i + 1}</Text>
+              <Box flex={1} color="white">
+                {/* <IXSummary instruction={ix} /> */}
+              </Box>
+            </Box>
+          ))}
+        </Box>
+        <Box padding="7">
+          {/* {proposalInfo &&
+            !proposalInfo.status.executed &&
+            proposalInfo.proposalData.instructions.length > 0 && (
+              <TransactionPreviewLink
+                instructions={proposalInfo.proposalData.instructions}
+              />
+            )} */}
+          <Box {...(!proposalInfo?.status.executed && { marginTop: '7' })}>
+            <ProposalBody description={description} issue={githubIssue} />
+          </Box>
+        </Box>
+      </Card>
+      {githubIssue && <GitHubComments issue={githubIssue} />}
+    </>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx
new file mode 100644
index 00000000..727184c4
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx
@@ -0,0 +1,52 @@
+import { Helmet } from "react-helmet";
+
+import { useCardinalName } from "../../../../../../hooks/cardinal/useAddressName";
+import { useGovernor } from "../../../../../../hooks/tribeca/useGovernor";
+import type { ProposalInfo } from "../../../../../../hooks/tribeca/useProposals";
+import { tsToDate } from "../../../../../../utils/utils";
+
+interface Props {
+  proposalInfo: ProposalInfo;
+}
+
+export const ProposalHelmet: React.FC<Props> = ({ proposalInfo }: Props) => {
+  const { daoName } = useGovernor();
+  const { index } = proposalInfo;
+
+  const cardinalName = useCardinalName(proposalInfo.proposalData.proposer);
+  const author = cardinalName ?? proposalInfo.proposalData.proposer.toString();
+  const twitterName = cardinalName?.startsWith("@") ? cardinalName : null;
+
+  const title = proposalInfo?.proposalMetaData
+    ? `${daoName ?? "Governance"} Proposal #${index}: ${
+        proposalInfo.proposalMetaData.title
+      }`
+    : `${daoName ?? "Governance"} Proposal #${index}`;
+
+  const description = proposalInfo.proposalMetaData
+    ? proposalInfo.proposalMetaData.descriptionLink.slice(0, 200)
+    : null;
+
+  return (
+    <Helmet>
+      <title>
+        {title} | {daoName}
+      </title>
+
+      {description && <meta name="description" content={description} />}
+      {description && <meta name="og:description" content={description} />}
+      {description && <meta name="twitter:description" content={description} />}
+
+      <meta name="og:title" content={title} />
+      <meta name="og:type" content="article" />
+      <meta
+        name="og:article:published_time"
+        content={tsToDate(proposalInfo.proposalData.createdAt).toISOString()}
+      />
+      {author && <meta name="og:article:author" content={author} />}
+
+      <meta name="twitter:title" content={title} />
+      {twitterName && <meta name="twitter:creator" content={twitterName} />}
+    </Helmet>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
new file mode 100644
index 00000000..79d1582a
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
@@ -0,0 +1,132 @@
+import type { SmartWalletTransactionData } from '@gokiprotocol/client';
+import type { ProgramAccount } from '@saberhq/token-utils';
+import type { ProposalData } from '@tribecahq/tribeca-sdk';
+import {
+  getProposalState,
+  PROPOSAL_STATE_LABELS,
+  ProposalState
+} from '@tribecahq/tribeca-sdk';
+import BN from 'bn.js';
+import { startCase } from 'lodash';
+import { Box, IconLink, Text } from 'degen';
+
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { useGokiTransactionData } from 'helpers/parser';
+import { Card } from 'components/common/governance/Card';
+
+const ZERO = new BN(0);
+interface Props {
+  className?: string;
+  proposalInfo?: ProposalInfo | null;
+}
+
+interface ProposalEvent {
+  title: string;
+  date: Date;
+  link?: string | null;
+}
+
+export const makeDate = (num: BN): Date => new Date(num.toNumber() * 1_000);
+
+const extractEvents = (
+  proposalData: ProposalData,
+  tx: ProgramAccount<SmartWalletTransactionData>
+): ProposalEvent[] => {
+  const events: ProposalEvent[] = [];
+  if (!proposalData.canceledAt.eq(ZERO)) {
+    events.push({ title: 'Canceled', date: makeDate(proposalData.canceledAt) });
+  }
+  if (!proposalData.activatedAt.eq(ZERO)) {
+    events.push({
+      title: 'Activated',
+      date: makeDate(proposalData.activatedAt)
+    });
+  }
+  if (!proposalData.createdAt.eq(ZERO)) {
+    events.push({ title: 'Created', date: makeDate(proposalData.createdAt) });
+  }
+  if (!proposalData.queuedAt.eq(ZERO)) {
+    events.push({
+      title: 'Queued',
+      date: makeDate(proposalData.queuedAt),
+      link: tx
+        ? `https://goki.so/#/wallets/${tx.account.smartWallet.toString()}/tx/${tx.account.index.toString()}`
+        : null
+    });
+  }
+  if (
+    !proposalData.votingEndsAt.eq(ZERO) &&
+    makeDate(proposalData.votingEndsAt) <= new Date()
+  ) {
+    // TODO: update quorum
+    const state = getProposalState({ proposalData });
+    events.push({
+      title: startCase(
+        PROPOSAL_STATE_LABELS[
+          state === ProposalState.Queued ? ProposalState.Succeeded : state
+        ]
+      ),
+      date: makeDate(proposalData.votingEndsAt)
+    });
+  }
+  if (tx?.account.executedAt.gt(new BN(0))) {
+    events.push({
+      title: 'Executed',
+      date: makeDate(tx.account.executedAt),
+      link: tx
+        ? `https://goki.so/#/wallets/${tx.account.smartWallet.toString()}/tx/${tx.account.index.toString()}`
+        : null
+    });
+  }
+  return events.sort((a, b) => (a.date < b.date ? -1 : 1));
+};
+
+export const ProposalHistory: React.FC<Props> = ({
+  className,
+  proposalInfo
+}: Props) => {
+  const { data: tx } = useGokiTransactionData(
+    !proposalInfo?.proposalData.queuedAt.eq(ZERO)
+      ? proposalInfo?.proposalData.queuedTransaction
+      : null
+  );
+  const events =
+    proposalInfo && tx ? extractEvents(proposalInfo.proposalData, tx) : [];
+  return (
+    <Card className={className} title="Proposal History">
+      <Box display="grid" paddingX="7" paddingY="4" gap="4">
+        {events.map(({ title, date, link }, i) => (
+          <Box key={i}>
+            <Box
+              display="flex"
+              alignItems="center"
+              justifyContent="space-between"
+            >
+              <Box display="flex" flexDirection="column" fontSize="small">
+                <Text color="white">{title}</Text>
+                <Text as="span" size="small">
+                  {date.toLocaleDateString(undefined, {
+                    month: 'long',
+                    day: 'numeric',
+                    year: 'numeric'
+                  })}{' '}
+                  &mdash; {date.toLocaleTimeString()}
+                </Text>
+              </Box>
+              {link && (
+                <a
+                  href={link}
+                  // tw="text-primary hover:text-white transition-colors"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  <IconLink />
+                </a>
+              )}
+            </Box>
+          </Box>
+        ))}
+      </Box>
+    </Card>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx b/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
new file mode 100644
index 00000000..73ce423e
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
@@ -0,0 +1,80 @@
+import { Fraction } from '@saberhq/token-utils';
+import type { ProposalData } from '@tribecahq/tribeca-sdk';
+import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { Box, Spinner } from 'degen';
+import BN from 'bn.js';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { Card } from 'components/common/governance/Card';
+import { Meter } from 'components/common/governance/Meter';
+
+export const VOTE_SIDE_LABEL = {
+  [VoteSide.For]: 'For',
+  [VoteSide.Against]: 'Against',
+  [VoteSide.Abstain]: 'Abstain',
+  [VoteSide.Pending]: 'Pending'
+} as const;
+
+interface Props {
+  side: VoteSide.For | VoteSide.Against;
+  proposal: ProposalData | null;
+}
+
+export const VotesCard: React.FC<Props> = ({ side, proposal }: Props) => {
+  const { veToken } = useGovernor();
+  const voteCount = !proposal
+    ? null
+    : side === VoteSide.For
+    ? proposal.forVotes
+    : side === VoteSide.Against
+    ? proposal.againstVotes
+    : new BN(0);
+
+  const voteCountFmt =
+    veToken && voteCount !== null ? (
+      new Fraction(voteCount, 10 ** veToken.decimals).asNumber.toLocaleString(
+        undefined,
+        {
+          maximumFractionDigits: 0
+        }
+      )
+    ) : (
+      <Spinner />
+    );
+
+  const totalDeterminingVotes = !proposal
+    ? null
+    : proposal.forVotes.add(proposal.againstVotes);
+
+  return (
+    <Card
+      title={
+        <Box display="flex" flexDirection="column" gap="3.5" width="full">
+          <Box
+            display="flex"
+            alignItems="center"
+            justifyContent="space-between"
+          >
+            <Box>{VOTE_SIDE_LABEL[side]}</Box>
+            <Box>{voteCountFmt}</Box>
+          </Box>
+          <Meter
+            value={voteCount ?? new BN(0)}
+            max={BN.max(totalDeterminingVotes ?? new BN(0), new BN(1))}
+            barColor="primary"
+            // barColor={
+            //   side === VoteSide.For
+            //     ? theme`colors.primary`
+            //     : theme`colors.red.500`
+            // }
+          />
+        </Box>
+      }
+      // titleStyles={tw`h-20`}
+      // link={{
+      //   title: "View All",
+      //   href: "",
+      // }}
+    />
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
new file mode 100644
index 00000000..3f5a70e2
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
@@ -0,0 +1,175 @@
+import { useSail, useTXHandlers } from '@saberhq/sail';
+import { sleep } from '@saberhq/token-utils';
+import { useEffect, useMemo } from 'react';
+import invariant from 'tiny-invariant';
+import { Box, Spinner, Text, Button, Stack } from 'degen';
+
+import { useUserEscrow } from 'hooks/tribeca/useEscrow';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { formatDurationSeconds } from 'helpers/format';
+// import { Button } from '../../../../../../common/Button';
+import { Card } from 'components/common/governance/Card';
+import Link from 'next/link';
+// import { LoadingPage } from '../../../../../../common/LoadingPage';
+
+interface Props {
+  proposal: ProposalInfo;
+  onActivate: () => void;
+}
+
+export const ProposalActivate: React.FC<Props> = ({
+  proposal,
+  onActivate
+}: Props) => {
+  const { minActivationThreshold, governorData } = useGovernor();
+  const { data: escrow, veBalance, refetch } = useUserEscrow();
+  const { handleTX } = useSail();
+  const { governorW } = useGovernor();
+  const { signAndConfirmTX } = useTXHandlers();
+
+  const earliestActivationTime = useMemo(
+    () =>
+      governorData
+        ? new Date(
+            proposal.proposalData.createdAt
+              .add(governorData.account.params.votingDelay)
+              .toNumber() * 1_000
+          )
+        : null,
+    [governorData, proposal.proposalData.createdAt]
+  );
+
+  useEffect(() => {
+    if (!earliestActivationTime) {
+      return;
+    }
+    const remainingTime = earliestActivationTime.getTime() - Date.now();
+    const timeout = setTimeout(() => {
+      void refetch();
+    }, remainingTime + 1);
+    return () => clearTimeout(timeout);
+  }, [earliestActivationTime, refetch]);
+
+  return (
+    <Card title="Actions">
+      <Box
+        paddingX="7"
+        paddingY="4"
+        fontSize="small"
+        display="flex"
+        flexDirection="column"
+        alignItems="center"
+      >
+        {!earliestActivationTime || !governorData ? (
+          <Spinner />
+        ) : earliestActivationTime > new Date() ? (
+          <Box display="flex" flexDirection="column" gap="4">
+            <Text as="p">
+              You must wait{' '}
+              {formatDurationSeconds(
+                governorData.account.params.votingDelay.toNumber()
+              )}{' '}
+              for this proposal to be activated.
+            </Text>
+            <Text as="p">
+              The proposal may be activated at{' '}
+              {earliestActivationTime?.toLocaleString(undefined, {
+                timeZoneName: 'short'
+              })}{' '}
+              by anyone who possesses at least{' '}
+              {minActivationThreshold?.formatUnits()}.
+            </Text>
+          </Box>
+        ) : minActivationThreshold &&
+          veBalance?.greaterThan(minActivationThreshold) ? (
+          <Box display="flex" justifyContent="center" alignItems="center">
+            <Button
+              disabled={!escrow}
+              // tw="w-3/4 dark:text-white hover:dark:text-primary hover:dark:border-primary"
+              variant="tertiary"
+              onClick={async () => {
+                invariant(escrow);
+                const tx = escrow.escrowW.activateProposal(
+                  proposal.proposalKey
+                );
+                await signAndConfirmTX(tx, 'Activate Proposal');
+                await sleep(1_000);
+                await refetch();
+                onActivate();
+              }}
+            >
+              Activate Proposal
+            </Button>
+          </Box>
+        ) : (
+          <Box display="flex" flexDirection="column" gap="4">
+            <Text as="p">
+              You must have at least{' '}
+              <strong>{minActivationThreshold?.formatUnits()}</strong> to
+              activate this proposal for voting.
+            </Text>
+            {veBalance ? (
+              <Text as="p">You currently have {veBalance?.formatUnits()}.</Text>
+            ) : (
+              <Text as="p">
+                You currently don&apos;t have any tokens vote locked.
+              </Text>
+            )}
+            <Box
+              // as={Link}
+              display="flex"
+              alignItems="center"
+              justifyContent="center"
+              href="locker"
+            >
+              <Box width="3/4" marginTop="4" textAlign="center">
+                <Button width="full" size="small">
+                  Lock Tokens
+                </Button>
+              </Box>
+            </Box>
+          </Box>
+        )}
+        <Box
+          gap="2"
+          marginTop="4"
+          width="full"
+          alignItems="center"
+          flexDirection="column"
+          display="flex"
+        >
+          {governorW &&
+            proposal.proposalData.proposer.equals(
+              governorW.provider.wallet.publicKey
+            ) && (
+              <Box
+                display="flex"
+                alignItems="center"
+                justifyContent="center"
+                width="3/4"
+              >
+                <Button
+                  variant="tertiary"
+                  width="full"
+                  size="small"
+                  onClick={async () => {
+                    const tx = governorW.cancelProposal({
+                      proposal: proposal.proposalKey
+                    });
+                    const handle = await handleTX(tx, 'Cancel Proposal');
+                    if (!handle.pending) {
+                      return;
+                    }
+                    await handle.pending.wait();
+                  }}
+                >
+                  Cancel
+                </Button>
+              </Box>
+            )}
+        </Box>
+      </Box>
+    </Card>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
new file mode 100644
index 00000000..aed8ce70
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
@@ -0,0 +1,177 @@
+import { mapSome, useTXHandlers } from '@saberhq/sail';
+import { TransactionInstruction } from '@solana/web3.js';
+// import pluralize from 'pluralize';
+import Countdown from 'react-countdown';
+import invariant from 'tiny-invariant';
+
+import { useSDK } from 'helpers/sdk';
+import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { useGokiTransactionData } from 'helpers/parser';
+import { gokiTXLink, tsToDate } from 'helpers/utils';
+// import { AsyncConfirmButton } from '../../../../../../common/AsyncConfirmButton';
+// import { Card } from '../../../../../../common/governance/Card';
+// import { ExternalLink } from '../../../../../../common/typography/ExternalLink';
+// import { ProseSmall } from '../../../../../../common/typography/Prose';
+// import { ExecuteProposalButton } from '../../../../GovernanceManageView/tabs/ExecutiveCouncilTab/ExecuteProposalButton';
+import { EmbedTX } from '../EmbedTX';
+import { Card } from 'components/common/governance/Card';
+import { Box, Text } from 'degen';
+import Link from 'next/link';
+
+interface Props {
+  proposal: ProposalInfo;
+  onActivate: () => void;
+}
+
+export const ProposalExecute: React.FC<Props> = ({
+  proposal,
+  onActivate
+}: Props) => {
+  const { governorW, smartWallet, manifest } = useGovernor();
+  const emergencyDAO = manifest?.addresses?.['emergency-dao']?.address;
+  const { sdkMut } = useSDK();
+  const { ecWallet, isMemberOfEC } = useExecutiveCouncil();
+  const { data: gokiTransactionData } = useGokiTransactionData(
+    proposal.proposalData.queuedTransaction
+  );
+  const { signAndConfirmTX } = useTXHandlers();
+
+  if (!gokiTransactionData) {
+    return <></>;
+  }
+
+  const votingEndedAt = tsToDate(proposal.proposalData.queuedAt);
+  const eta = tsToDate(gokiTransactionData.account.eta);
+  const gracePeriodEnd = mapSome(ecWallet.data, d =>
+    !gokiTransactionData.account.eta.isNeg()
+      ? tsToDate(gokiTransactionData.account.eta.add(d.account.gracePeriod))
+      : null
+  );
+
+  const etaSurpassed = eta <= new Date();
+  const gracePeriodSurpassed = mapSome(gracePeriodEnd, g => g <= new Date());
+
+  return (
+    <Card title="Execute Proposal">
+      <Box paddingX="7" paddingY="4" fontSize="small">
+        {/* <ProseSmall> */}
+        <Box marginBottom="4">
+          <Text as="p">
+            The proposal was queued on{' '}
+            <Text as="span" color="white">
+              {votingEndedAt.toLocaleString(undefined, {
+                timeZoneName: 'short'
+              })}
+            </Text>
+            .
+          </Text>
+        </Box>
+        {gracePeriodSurpassed ? (
+          <Text as="p">
+            The proposal execution period expired on{' '}
+            {gracePeriodEnd?.toLocaleString(undefined, {
+              timeZoneName: 'short'
+            })}
+            . This proposal may no longer be executed by the Executive Council.
+          </Text>
+        ) : etaSurpassed ? (
+          <Text as="p">
+            It may now be executed by any member of the{' '}
+            <Link href={'details'}>Executive Council</Link> at any time before{' '}
+            {gracePeriodEnd?.toLocaleString(undefined, {
+              timeZoneName: 'short'
+            })}
+            .
+          </Text>
+        ) : (
+          <Text as="p">
+            It may be executed by any member of the{' '}
+            <Link href={'details'}>Executive Council</Link> in{' '}
+            <Countdown date={eta} />.
+          </Text>
+        )}
+        {/* <ExternalLink tw="mb-4" href={gokiTXLink(gokiTransactionData.account)}>
+          View on Goki
+        </ExternalLink> */}
+        {/* </ProseSmall> */}
+        {/* {isMemberOfEC && (
+          <Box
+            display="flex"
+            justifyContent="space-between"
+            alignItems="center"
+            marginBottom="8"
+          >
+            {gracePeriodSurpassed && emergencyDAO && (
+              <AsyncConfirmButton
+                modal={{
+                  title: 'Revive Proposal via Emergency DAO',
+                  contents: (
+                    <div tw="prose prose-light prose-sm">
+                      <p>
+                        You are about to propose the following{' '}
+                        {pluralize(
+                          'instruction',
+                          gokiTransactionData.account.instructions.length
+                        )}{' '}
+                        on behalf of the emergency DAO:
+                      </p>
+                      <div>
+                        <EmbedTX txKey={gokiTransactionData.publicKey} />
+                      </div>
+                    </div>
+                  )
+                }}
+                disabled={!governorW || !ecWallet.data || !etaSurpassed}
+                tw="w-3/4"
+                variant="primary"
+                onClick={async () => {
+                  invariant(
+                    governorW && sdkMut && smartWallet && ecWallet.data
+                  );
+
+                  const daoWallet = await sdkMut.loadSmartWallet(smartWallet);
+                  const emergencyDAOWallet = await sdkMut.loadSmartWallet(
+                    emergencyDAO
+                  );
+
+                  const { tx: innerTx } = await daoWallet.newTransaction({
+                    proposer: emergencyDAOWallet.key,
+                    instructions: proposal.proposalData.instructions.map(
+                      ix =>
+                        new TransactionInstruction({
+                          ...ix,
+                          data: Buffer.from(ix.data)
+                        })
+                    )
+                  });
+                  const { tx } = await emergencyDAOWallet.newTransaction({
+                    instructions: innerTx.instructions
+                  });
+                  invariant(tx.instructions[0]);
+                  await signAndConfirmTX(tx, `Revive Proposal`);
+                }}
+              >
+                {!etaSurpassed ? (
+                  <>
+                    <Box marginRight="1">
+                      <Text as="span">ETA in</Text>
+                    </Box>
+                    <Countdown date={eta} />
+                  </>
+                ) : (
+                  'Revive Proposal via Emergency DAO'
+                )}
+              </AsyncConfirmButton>
+            )}
+            <ExecuteProposalButton
+              tx={gokiTransactionData}
+              onActivate={onActivate}
+            />
+          </Box>
+        )} */}
+      </Box>
+    </Card>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx
new file mode 100644
index 00000000..cd5794c5
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx
@@ -0,0 +1,60 @@
+import { useSail } from '@saberhq/sail';
+import BN from 'bn.js';
+import invariant from 'tiny-invariant';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { Card } from 'components/common/governance/Card';
+import { Box, Button, Text } from 'degen';
+// import { AsyncButton } from '../../../../../../common/AsyncButton';
+
+interface Props {
+  proposal: ProposalInfo;
+  onActivate: () => void;
+}
+
+export const ProposalQueue: React.FC<Props> = ({
+  proposal,
+  onActivate
+}: Props) => {
+  const { governorW } = useGovernor();
+  const { handleTX } = useSail();
+
+  const votingEndedAt = new Date(
+    proposal.proposalData.votingEndsAt.toNumber() * 1_000
+  );
+
+  return (
+    <Card title="Proposal Passed">
+      <Box paddingX="7" paddingY="4" fontSize="small">
+        <Box marginBottom="4">
+          <Text as="p">
+            The proposal passed successfully on {votingEndedAt.toLocaleString()}
+            .
+          </Text>
+        </Box>
+        <Box display="flex" alignItems="center" justifyContent="space-between">
+          <Button
+            width="3/4"
+            disabled={!governorW}
+            variant="primary"
+            onClick={async () => {
+              invariant(governorW);
+              const tx = await governorW.queueProposal({
+                index: new BN(proposal.index)
+              });
+              const { pending, success } = await handleTX(tx, 'Queue Proposal');
+              if (!pending || !success) {
+                return;
+              }
+              await pending.wait();
+              onActivate();
+            }}
+          >
+            Queue Proposal
+          </Button>
+        </Box>
+      </Box>
+    </Card>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
new file mode 100644
index 00000000..c69140b4
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
@@ -0,0 +1,147 @@
+import { ConnectWalletButton } from '@gokiprotocol/walletkit';
+import { TokenAmount } from '@saberhq/token-utils';
+import type { VoteSide } from '@tribecahq/tribeca-sdk';
+import { VOTE_SIDE_LABELS } from '@tribecahq/tribeca-sdk';
+
+import { useSDK } from 'helpers/sdk';
+import { useUserEscrow } from 'hooks/tribeca/useEscrow';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { useVote } from 'hooks/tribeca/useVote';
+// import { MouseoverTooltip } from '../../../../../../common/MouseoverTooltip';
+import { sideColor } from 'helpers/utils';
+import { Card } from 'components/common/governance/Card';
+import { CastVoteButton } from '../CastVoteButton';
+import { Box, Button, Text } from 'degen';
+import Link from 'next/link';
+
+interface Props {
+  proposalInfo: ProposalInfo;
+  onVote: () => void;
+}
+
+export const ProposalVote: React.FC<Props> = ({ proposalInfo }: Props) => {
+  const { veToken } = useGovernor();
+  const { sdkMut } = useSDK();
+  const { data: escrow, veBalance } = useUserEscrow();
+  const { data: vote } = useVote(
+    proposalInfo.proposalKey,
+    sdkMut?.provider.wallet.publicKey
+  );
+  const vePower =
+    veToken && escrow
+      ? new TokenAmount(
+          veToken,
+          escrow.calculateVotingPower(
+            proposalInfo.proposalData.votingEndsAt.toNumber()
+          )
+        )
+      : null;
+
+  const lockupTooShort =
+    escrow &&
+    escrow.escrow.escrowEndsAt.lt(proposalInfo.proposalData.votingEndsAt);
+
+  return (
+    <Card
+      title={
+        <Box display="flex">
+          <Text as="span">Vote</Text>
+          {/* {lockupTooShort && (
+            <MouseoverTooltip
+              text={
+                <div tw="max-w-sm">
+                  <p>
+                    Your voting escrow expires before the period which voting
+                    ends. Please extend your lockup to cast your vote.
+                  </p>
+                </div>
+              }
+              placement="bottom-start"
+            >
+              <FaExclamationTriangle tw="h-4 cursor-pointer inline-block align-middle mx-2 mb-0.5 text-yellow-500" />
+            </MouseoverTooltip>
+          )} */}
+        </Box>
+      }
+    >
+      <Box paddingY="8">
+        <Box display="flex" flexDirection="column" alignItems="center" gap="4">
+          {!sdkMut ? (
+            <ConnectWalletButton />
+          ) : !veBalance ? (
+            <Box paddingX="8" fontSize="small" textAlign="center">
+              <Text as="p">
+                You must lock tokens in order to vote on this proposal.
+              </Text>
+              {/* <Link tw="flex justify-center items-center" href={'locker'}> */}
+              <Button
+                // as={Link}
+                href="locker"
+                // variant="outline"
+                // tw="border-white hover:(border-primary bg-primary bg-opacity-20) mt-4"
+              >
+                Lock Tokens
+              </Button>
+              {/* </Link> */}
+            </Box>
+          ) : (
+            <>
+              <Box
+                display="flex"
+                flexDirection="column"
+                alignItems="center"
+                gap="1"
+              >
+                <Text as="span" size="small" weight="medium">
+                  Voting Power
+                </Text>
+                <Text as="span" color="white" weight="semiBold" size="large">
+                  {vePower?.formatUnits()}
+                </Text>
+              </Box>
+              {vote && (
+                <Box
+                  display="flex"
+                  flexDirection="column"
+                  alignItems="center"
+                  gap="1"
+                >
+                  <Text as="span" size="small" weight="medium">
+                    You Voted
+                  </Text>
+                  <Text
+                    as="span"
+                    color="white"
+                    weight="semiBold"
+                    size="large"
+                    // style={
+                    //   vote
+                    //     ? {
+                    //         color: sideColor(vote.accountInfo.data.side)
+                    //       }
+                    //     : {}
+                    // }
+                  >
+                    {VOTE_SIDE_LABELS[vote.accountInfo.data.side as VoteSide]}
+                  </Text>
+                </Box>
+              )}
+              <Box
+                display="flex"
+                width="full"
+                alignItems="center"
+                justifyContent="center"
+              >
+                <CastVoteButton
+                  proposalInfo={proposalInfo}
+                  side={vote ? vote.accountInfo.data.side : null}
+                />
+              </Box>
+            </>
+          )}
+        </Box>
+      </Box>
+    </Card>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/github.ts b/components/Proposals/ProposalIndexView/locked-voter/github.ts
new file mode 100644
index 00000000..aa162d4c
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/github.ts
@@ -0,0 +1,41 @@
+import type { RestEndpointMethodTypes } from "@octokit/plugin-rest-endpoint-methods";
+import { fetchNullable } from "@saberhq/sail";
+import { useQuery } from "react-query";
+
+export type GitHubIssue =
+  RestEndpointMethodTypes["issues"]["get"]["response"]["data"];
+
+export type GitHubComments =
+  RestEndpointMethodTypes["issues"]["listComments"]["response"]["data"];
+
+export const extractGitHubIssueURL = (body: string): string | null => {
+  const match = body.match(
+    /\[View Discussion\]\(https:\/\/github.com\/(\w+)\/(\w+)\/issues\/(\d+)\)/
+  );
+  if (!match) {
+    return null;
+  }
+  const [_, org, repo, issue] = match;
+  if (!org || !repo || !issue) {
+    return null;
+  }
+  return `https://api.github.com/repos/${org}/${repo}/issues/${issue}`;
+};
+
+export const useGitHubIssue = (issueURL: string | null) => {
+  return useQuery(["githubIssue", issueURL], async () => {
+    if (!issueURL) {
+      return null;
+    }
+    return await fetchNullable<GitHubIssue>(issueURL);
+  });
+};
+
+export const useGitHubIssueComments = (commentsURL: string | null) => {
+  return useQuery(["githubIssueComments", commentsURL], async () => {
+    if (!commentsURL) {
+      return null;
+    }
+    return await fetchNullable<GitHubComments>(commentsURL);
+  });
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
new file mode 100644
index 00000000..16689b4d
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
@@ -0,0 +1,126 @@
+import { ProposalState, VoteSide } from '@tribecahq/tribeca-sdk';
+import { noop } from 'lodash';
+import { useRouter } from 'next/router';
+
+import { useProposal } from 'hooks/tribeca/useProposals';
+// import { ContentLoader } from '../../../../../common/ContentLoader';
+import { GovernancePage } from 'components/common/governance/GovernancePage';
+import { Profile } from 'components/common/governance/Profile';
+// import { PlaceholderSubtitle } from '../../../GovernanceOverviewView/locked-voter/ProposalsList/PlaceholderCard';
+// import { ProposalSubtitle } from '../../../GovernanceOverviewView/locked-voter/ProposalsList/ProposalSubtitle';
+import { ProposalActivate } from './actions/ProposalActivate';
+import { ProposalExecute } from './actions/ProposalExecute';
+import { ProposalQueue } from './actions/ProposalQueue';
+import { ProposalVote } from './actions/ProposalVote';
+import { ProposalDetails } from './ProposalDetails';
+import { ProposalHelmet } from './ProposalHelmet';
+import { ProposalHistory } from './ProposalHistory';
+import { VotesCard } from './VotesCard';
+import { Box, Stack, Text } from 'degen';
+
+export const ProposalIndexView: React.FC = () => {
+  const router = useRouter();
+  const proposalIndexStr = router.query.proposalIndex as string;
+  const { info: proposalInfo } = useProposal(parseInt(proposalIndexStr));
+
+  return (
+    <GovernancePage
+      title={
+        <Text
+          as="h1"
+          size="extraLarge"
+          weight="bold"
+          color="white"
+          // tw="text-2xl md:text-3xl font-bold text-white tracking-tighter"
+        >
+          <Box
+            // minHeight="36px"
+            display="flex"
+            alignItems="center"
+            // tw="min-h-[36px] flex items-center break-words hyphens[auto]"
+          >
+            {proposalInfo ? (
+              proposalInfo?.proposalMetaData?.title ?? 'Proposal'
+            ) : (
+              <div></div>
+              // <ContentLoader tw="w-40 h-7" />
+            )}
+          </Box>
+        </Text>
+      }
+      header={
+        <Box display="flex" alignItems="center" gap="2" marginTop="2">
+          {/* <Box
+          //  tw="min-h-[20px]"
+          >
+            {proposalInfo ? (
+              <ProposalSubtitle proposalInfo={proposalInfo} />
+            ) : (
+              <PlaceholderSubtitle />
+            )}
+          </Box> */}
+        </Box>
+      }
+      right={
+        proposalInfo ? (
+          <Box borderRadius="medium" padding="3">
+            {/* <Profile address={proposalInfo.proposalData.proposer} /> */}
+          </Box>
+        ) : undefined
+      }
+    >
+      {/* {proposalInfo && <ProposalHelmet proposalInfo={proposalInfo} />} */}
+      <Box display="grid" gap="4" marginBottom="20">
+        <Stack
+          direction="horizontal"
+          // tw="grid md:grid-cols-2 gap-4"
+        >
+          <Box flex={1}>
+            <VotesCard
+              side={VoteSide.For}
+              proposal={proposalInfo ? proposalInfo.proposalData : null}
+            />
+          </Box>
+          <Box flex={1}>
+            <VotesCard
+              side={VoteSide.Against}
+              proposal={proposalInfo ? proposalInfo.proposalData : null}
+            />
+          </Box>
+        </Stack>
+        <Box
+          display="flex"
+          flexDirection={{ sm: 'column', md: 'row' }}
+          alignItems={{ md: 'flex-start' }}
+          gap="4"
+          // tw="flex flex-col md:(flex-row items-start) gap-4"
+        >
+          <Box display="flex" flex={1} flexDirection="column" gap="4">
+            <ProposalDetails proposalInfo={proposalInfo} />
+          </Box>
+          <Box
+            display="flex"
+            flexDirection="column"
+            width={{ md: '1/3', sm: 'full' }}
+            gap="4"
+            // tw="w-full md:w-[350px] flex flex-col gap-4"
+          >
+            {proposalInfo?.status.state === ProposalState.Draft && (
+              <ProposalActivate proposal={proposalInfo} onActivate={noop} />
+            )}
+            {proposalInfo?.status.state === ProposalState.Active && (
+              <ProposalVote proposalInfo={proposalInfo} onVote={noop} />
+            )}
+            {proposalInfo?.status.state === ProposalState.Succeeded && (
+              <ProposalQueue proposal={proposalInfo} onActivate={noop} />
+            )}
+            {proposalInfo?.status.state === ProposalState.Queued && (
+              <ProposalExecute proposal={proposalInfo} onActivate={noop} />
+            )}
+            <ProposalHistory proposalInfo={proposalInfo} />
+          </Box>
+        </Box>
+      </Box>
+    </GovernancePage>
+  );
+};
diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
index c717b353..bda16b0a 100644
--- a/components/Proposals/ProposalsList/ProposalCard.tsx
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -16,71 +16,79 @@ interface Props {
 }
 
 export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
-  const { path } = useGovernor();
+  // const { path } = useGovernor();
   const { state, executed } = proposalInfo.status;
   return (
     <Link
-      href={`${path}/proposals/${proposalInfo.index}`}
       passHref
+      href={`proposals/${proposalInfo.index}`}
       // tw="flex items-center justify-between py-5 px-6 border-l-2 border-l-transparent border-b border-b-warmGray-800 cursor-pointer hover:border-l-primary"
     >
       <Box
         display="flex"
         alignItems="center"
-        gap="5"
-        width={{ md: '192', xs: '3/4' }}
-        // tw="flex items-center gap-5 w-3/4 md:w-[500px]"
+        justifyContent="space-between"
+        paddingX="6"
+        paddingY="5"
+        // as={Link}
       >
-        {state === ProposalState.Active && <PulsingDot color="decendent" />}
-        <div>
-          <Box display="flex" alignItems="center">
-            <Text
-              color="white"
-              lineHeight="1.375"
-              // tw="text-white leading-snug break-words hyphens[auto]"
-            >
-              {proposalInfo.proposalMetaData?.title.slice(
-                0,
-                PROPOSAL_TITLE_MAX_LEN
-              )}
-            </Text>
-          </Box>
-          {proposalInfo.proposalData && state !== null && (
-            <Box
-              display="flex"
-              flexDirection={{ md: 'row', xs: 'column' }}
-              alignItems={{ md: 'center' }}
-              marginTop={{ md: '4', xs: '2' }}
-              gap="2"
-              // tw="flex flex-col mt-4 gap-2 md:(flex-row items-center mt-2)"
-            >
-              <ProposalStateLabel state={state} executed={executed} />
+        <Box
+          display="flex"
+          alignItems="center"
+          gap="5"
+          width={{ md: '192', xs: '3/4' }}
+          // tw="flex items-center gap-5 w-3/4 md:w-[500px]"
+        >
+          {state === ProposalState.Active && <PulsingDot color="decendent" />}
+          <div>
+            <Box display="flex" alignItems="center">
+              <Text
+                color="white"
+                lineHeight="1.375"
+                // tw="text-white leading-snug break-words hyphens[auto]"
+              >
+                {proposalInfo.proposalMetaData?.title.slice(
+                  0,
+                  PROPOSAL_TITLE_MAX_LEN
+                )}
+              </Text>
+            </Box>
+            {proposalInfo.proposalData && state !== null && (
               <Box
                 display="flex"
-                gap="1"
-                fontSize="small"
-                fontWeight="semiBold"
+                flexDirection={{ md: 'row', xs: 'column' }}
+                alignItems={{ md: 'center' }}
+                marginTop={{ md: '4', xs: '2' }}
+                gap="2"
               >
-                <span>{`000${proposalInfo.index}`.slice(-4)}</span>
-                <span>&middot;</span>
-                <ProposalStateDate proposalInfo={proposalInfo} />
+                <ProposalStateLabel state={state} executed={executed} />
+                <Box
+                  display="flex"
+                  gap="1"
+                  fontSize="small"
+                  fontWeight="semiBold"
+                >
+                  <Text as="span">{`000${proposalInfo.index}`.slice(-4)}</Text>
+                  <Text as="span">&middot;</Text>
+                  <ProposalStateDate proposalInfo={proposalInfo} />
+                </Box>
               </Box>
-            </Box>
-          )}
-        </div>
-      </Box>
-      {state === ProposalState.Active && (
-        <Box width="192">
-          <ActiveProposalVotingBars proposal={proposalInfo} />
+            )}
+          </div>
         </Box>
-      )}
-      {state !== null &&
-        state !== ProposalState.Draft &&
-        state !== ProposalState.Active && (
-          <Box width={{ sm: '16', md: '20', lg: '40' }}>
-            <ProposalStateBadge status={proposalInfo.status} />
+        {state === ProposalState.Active && (
+          <Box width="192">
+            <ActiveProposalVotingBars proposal={proposalInfo} />
           </Box>
         )}
+        {state !== null &&
+          state !== ProposalState.Draft &&
+          state !== ProposalState.Active && (
+            <Box width={{ sm: '16', md: '20', lg: '40' }}>
+              <ProposalStateBadge status={proposalInfo.status} />
+            </Box>
+          )}
+      </Box>
     </Link>
   );
 };
diff --git a/components/Proposals/ProposalsList/ProposalStateDate.tsx b/components/Proposals/ProposalsList/ProposalStateDate.tsx
index bcc26ed5..7d9a0dc4 100644
--- a/components/Proposals/ProposalsList/ProposalStateDate.tsx
+++ b/components/Proposals/ProposalsList/ProposalStateDate.tsx
@@ -1,24 +1,22 @@
-import type { ProposalData } from "@tribecahq/tribeca-sdk";
-import { ProposalState } from "@tribecahq/tribeca-sdk";
-import type BN from "bn.js";
-import Countdown from "react-countdown";
+import type { ProposalData } from '@tribecahq/tribeca-sdk';
+import { ProposalState } from '@tribecahq/tribeca-sdk';
+import type BN from 'bn.js';
+import Countdown from 'react-countdown';
 
-import type {
-  ProposalInfo,
-  ProposalStatus,
-} from "../../../../../../hooks/tribeca/useProposals";
+import type { ProposalInfo, ProposalStatus } from 'hooks/tribeca/useProposals';
+import { Text } from 'degen';
 
 interface Props {
   proposalInfo: ProposalInfo;
 }
 
 const STATE_LABELS: { [K in ProposalState]: string } = {
-  [ProposalState.Active]: "Voting ends",
-  [ProposalState.Draft]: "Created",
-  [ProposalState.Canceled]: "Canceled",
-  [ProposalState.Defeated]: "Failed",
-  [ProposalState.Succeeded]: "Passed",
-  [ProposalState.Queued]: "Queued",
+  [ProposalState.Active]: 'Voting ends',
+  [ProposalState.Draft]: 'Created',
+  [ProposalState.Canceled]: 'Canceled',
+  [ProposalState.Defeated]: 'Failed',
+  [ProposalState.Succeeded]: 'Passed',
+  [ProposalState.Queued]: 'Queued'
 };
 
 export const stateToDateSeconds = (
@@ -50,23 +48,23 @@ export const ProposalStateDate: React.FC<Props> = ({ proposalInfo }: Props) => {
   const dateSeconds = stateToDateSeconds(proposalData, status);
   const date = dateSeconds ? new Date(dateSeconds.toNumber() * 1_000) : null;
   return (
-    <span>
-      {executed ? "Executed" : STATE_LABELS[state]}{" "}
+    <Text as="span">
+      {executed ? 'Executed' : STATE_LABELS[state]}{' '}
       {state === ProposalState.Active ? (
         date ? (
           <>
             in <Countdown date={date} />
           </>
         ) : (
-          "--"
+          '--'
         )
       ) : (
         date?.toLocaleDateString(undefined, {
-          month: "long",
-          day: "numeric",
-          year: "numeric",
+          month: 'long',
+          day: 'numeric',
+          year: 'numeric'
         })
       )}
-    </span>
+    </Text>
   );
 };
diff --git a/components/Proposals/ProposalsList/ProposalStateLabel.tsx b/components/Proposals/ProposalsList/ProposalStateLabel.tsx
index 6be607f9..dbea0f39 100644
--- a/components/Proposals/ProposalsList/ProposalStateLabel.tsx
+++ b/components/Proposals/ProposalsList/ProposalStateLabel.tsx
@@ -1,5 +1,5 @@
 import { ProposalState } from '@tribecahq/tribeca-sdk';
-import { Text } from 'degen';
+import { Box, BoxProps, Text } from 'degen';
 import { startCase } from 'lodash';
 
 interface Props {
@@ -20,24 +20,35 @@ export const ProposalStateLabel: React.FC<Props> = ({
   state,
   executed
 }: Props) => {
+  let borderColor: BoxProps['color'] = 'inherit';
+  let textColor: BoxProps['color'] = 'inherit';
+  if (
+    state === ProposalState.Canceled ||
+    state === ProposalState.Defeated ||
+    state === ProposalState.Draft
+  ) {
+    borderColor = 'text';
+    textColor = 'text';
+  }
+  if (
+    executed ||
+    state === ProposalState.Succeeded ||
+    state === ProposalState.Queued
+  ) {
+    borderColor = 'green';
+    textColor = 'green';
+  }
   return (
-    <Text
-      size="small"
-      align="center"
-      // css={[
-      //   tw`text-xs border rounded py-0.5 w-16 flex items-center justify-center`,
-      //   (state === ProposalState.Canceled ||
-      //     state === ProposalState.Defeated ||
-      //     state === ProposalState.Draft) &&
-      //     tw`border-gray-500 text-gray-500`,
-      //   (executed ||
-      //     state === ProposalState.Succeeded ||
-      //     state === ProposalState.Queued) &&
-      //     tw`border-primary text-primary`,
-      //   state === ProposalState.Active && tw`border-accent text-accent`
-      // ]}
+    <Box
+      borderWidth="px"
+      borderRadius="medium"
+      paddingY="0.5"
+      width="16"
+      borderColor={borderColor}
     >
-      {startCase(executed ? 'executed' : STATE_LABELS[state])}
-    </Text>
+      <Text size="small" align="center" color={textColor}>
+        {startCase(executed ? 'executed' : STATE_LABELS[state])}
+      </Text>
+    </Box>
   );
 };
diff --git a/components/HelperCard.tsx b/components/common/HelperCard.tsx
similarity index 100%
rename from components/HelperCard.tsx
rename to components/common/HelperCard.tsx
diff --git a/components/common/governance/Card.tsx b/components/common/governance/Card.tsx
new file mode 100644
index 00000000..7516c03c
--- /dev/null
+++ b/components/common/governance/Card.tsx
@@ -0,0 +1,108 @@
+import { Box, Text } from 'degen';
+import Link from 'next/link';
+
+import { HelperCard } from '../HelperCard';
+
+interface Props {
+  className?: string;
+  title?: React.ReactNode;
+  titleStyles?: React.CSSProperties;
+  children?: React.ReactNode;
+  link?: {
+    title: string;
+    href?: string;
+  };
+  /**
+   * Whether or not to add padding to the card's body.
+   */
+  padded?: boolean;
+  bodyScrollX?: boolean;
+}
+
+export const Card: React.FC<Props> = ({
+  className,
+  title,
+  titleStyles,
+  children,
+  link,
+  padded = false,
+  bodyScrollX = false
+}: Props) => {
+  return (
+    <Box
+      borderRadius="medium"
+      backgroundColor="black"
+      boxShadow="0.5"
+      display="flex"
+      flexDirection="column"
+      className={className}
+      // tw="rounded bg-warmGray-850 shadow-xl flex flex-col"
+    >
+      {title && (
+        <Box
+          width="full"
+          height="16"
+          display="flex"
+          alignItems="center"
+          paddingX="7"
+          fontWeight="bold"
+          color="white"
+          // tw="h-16 flex items-center px-7 w-full text-white font-bold tracking-tight border-b border-warmGray-800"
+          // style={titleStyles}
+        >
+          {typeof title === 'string' ? <Text as="h2">{title}</Text> : title}
+        </Box>
+      )}
+      {/* <ErrorBoundary
+        fallback={
+          <div tw="py-7 px-4">
+            <HelperCard variant="error">
+              An unexpected error occurred.
+            </HelperCard>
+          </div>
+        }
+      > */}
+      <Box
+        {...(padded && { paddingX: '7', paddingY: '4' })}
+        {...(bodyScrollX && { overflow: 'auto' })}
+        // css={[padded && tw`px-7 py-4`, bodyScrollX && tw`overflow-x-auto`]}
+      >
+        {children}
+      </Box>
+      {/* </ErrorBoundary> */}
+      {link &&
+        (link.href ? (
+          <Box
+            as={Link}
+            href={link.href}
+            color={{ base: 'white', hover: 'textPrimary' }}
+          >
+            <Box
+              display="flex"
+              alignItems="center"
+              justifyContent="center"
+              paddingY="5"
+              fontSize="small"
+              fontWeight="bold"
+              textTransform="uppercase"
+              // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800"
+            >
+              {link.title}
+            </Box>
+          </Box>
+        ) : (
+          <Box
+            display="flex"
+            alignItems="center"
+            justifyContent="center"
+            paddingY="5"
+            fontSize="small"
+            fontWeight="bold"
+            // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800 text-warmGray-600 cursor-not-allowed"
+          >
+            {link.title}
+          </Box>
+        ))}
+    </Box>
+  );
+};
diff --git a/components/common/governance/GovernancePage.tsx b/components/common/governance/GovernancePage.tsx
new file mode 100644
index 00000000..f5ce329b
--- /dev/null
+++ b/components/common/governance/GovernancePage.tsx
@@ -0,0 +1,35 @@
+import {
+  useGovernor
+  // useGovernorInfo,
+} from 'hooks/tribeca/useGovernor';
+// import { GovernanceNotFoundPage } from '../../pages/governance/GovernanceNotFoundPage';
+// import { LoadingPage } from '../LoadingPage';
+import { GovernancePageInner } from './GovernancePageInner';
+
+interface Props {
+  title: React.ReactNode;
+  header?: React.ReactNode;
+  right?: React.ReactNode;
+  preContent?: React.ReactNode;
+  children?: React.ReactNode;
+  contentStyles?: React.CSSProperties;
+  containerStyles?: React.CSSProperties;
+  hideDAOName?: boolean;
+  backLink?: {
+    label: string;
+    href: string;
+  };
+}
+
+export const GovernancePage: React.FC<Props> = ({ ...props }: Props) => {
+  // const info = useGovernorInfo();
+  const { governorData } = useGovernor();
+  if (governorData === null) {
+    return <div>Not found</div>;
+    // return <GovernanceNotFoundPage />;
+  }
+  // if (info?.loading) {
+  //   return <LoadingPage />;
+  // }
+  return <GovernancePageInner {...props} />;
+};
diff --git a/components/common/governance/GovernancePageInner.tsx b/components/common/governance/GovernancePageInner.tsx
new file mode 100644
index 00000000..d047d1da
--- /dev/null
+++ b/components/common/governance/GovernancePageInner.tsx
@@ -0,0 +1,136 @@
+import Link from 'next/link';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+// import { ImageWithFallback } from '../ImageWithFallback';
+import { Box, IconChevronLeft, Text } from 'degen';
+
+interface Props {
+  title: React.ReactNode;
+  header?: React.ReactNode;
+  right?: React.ReactNode;
+  preContent?: React.ReactNode;
+  children?: React.ReactNode;
+  contentStyles?: React.CSSProperties;
+  containerStyles?: React.CSSProperties;
+  hideDAOName?: boolean;
+  backLink?: {
+    label: string;
+    href: string;
+  };
+}
+
+export const GovernancePageInner: React.FC<Props> = ({
+  title,
+  header,
+  right,
+  preContent,
+  children,
+  contentStyles,
+  containerStyles,
+  hideDAOName = false,
+  backLink
+}: Props) => {
+  // const { daoName, iconURL } = useGovernor();
+  return (
+    <Box width="full">
+      <Box paddingBottom="24">
+        <Box
+          height="6"
+          width="3/4"
+          maxWidth="screenLg"
+          marginBottom="4"
+          // tw="h-6 mx-auto w-11/12 max-w-7xl mb-4"
+        >
+          {!hideDAOName && (
+            <Box
+              display="flex"
+              alignItems="center"
+              gap="2"
+              fontSize="small"
+              fontWeight="semiBold"
+              color="white"
+            >
+              {/* <ImageWithFallback
+                src={iconURL}
+                size={24}
+                alt={`Icon for ${daoName ?? 'DAO'}`}
+              />
+              <span>{daoName} Governance</span> */}
+            </Box>
+          )}
+        </Box>
+        <Box style={containerStyles}>
+          <Box
+            width="full"
+            display="flex"
+            flexDirection={{ md: 'row', lg: 'column' }}
+            alignItems="center"
+            justifyContent="space-between"
+            gap={{ md: '8', lg: '4' }}
+            flexWrap="wrap"
+            // tw="flex flex-col gap-4 md:(gap-8 flex-row min-h-[120px]) flex-wrap items-center justify-between w-full"
+          >
+            <Box
+              display="flex"
+              flexDirection="column"
+              alignSelf={{ md: 'center', lg: 'flex-start' }}
+              // tw="flex flex-col self-start md:self-center"
+            >
+              {backLink && (
+                <Box
+                  as={Link}
+                  marginBottom="7"
+                  display="flex"
+                  alignItems="center"
+                  gap="2"
+                  fontWeight="bold"
+                  color={{ hover: 'white' }}
+                >
+                  <IconChevronLeft size="5" />
+                  <Text
+                    as="span"
+                    size="small"
+                    // tw="leading-none text-sm tracking-tighter"
+                  >
+                    {backLink.label}
+                  </Text>
+                </Box>
+              )}
+              {typeof title === 'string' ? (
+                <Text
+                  as="h1"
+                  size="headingOne"
+                  weight="bold"
+                  color="white"
+                  // tw="text-2xl md:text-3xl font-bold text-white tracking-tighter"
+                >
+                  {title}
+                </Text>
+              ) : (
+                title
+              )}
+              {header}
+            </Box>
+            {right && <div>{right}</div>}
+          </Box>
+          {preContent && <Box marginTop="8">{preContent}</Box>}
+        </Box>
+      </Box>
+      <Box style={containerStyles}>
+        <Box
+          as="main"
+          width="full"
+          marginTop="-4"
+          marginBottom="20"
+          style={contentStyles}
+        >
+          {children}
+        </Box>
+      </Box>
+    </Box>
+  );
+};
+
+// export const Box wid = styled.div(
+//   () => tw`max-w-5xl w-full md:w-11/12 mx-auto`
+// );
diff --git a/components/common/governance/Meter.tsx b/components/common/governance/Meter.tsx
new file mode 100644
index 00000000..d393f8ba
--- /dev/null
+++ b/components/common/governance/Meter.tsx
@@ -0,0 +1,42 @@
+import { Box } from 'degen';
+import { Fraction } from '@saberhq/token-utils';
+import type BN from 'bn.js';
+
+interface Props {
+  value: BN | number;
+  max: BN | number;
+  barColor: string;
+  className?: string;
+}
+
+export const Meter: React.FC<Props> = ({
+  value,
+  max,
+  barColor,
+  className
+}: Props) => {
+  const width =
+    typeof value === 'number' && typeof max === 'number'
+      ? value / max
+      : new Fraction(value, max).asNumber;
+  return (
+    <Box
+      className={className}
+      flexGrow={1}
+      backgroundColor="accent"
+      height="1"
+      borderRadius="medium"
+    >
+      <Box
+        style={{
+          width: `${Math.min(width, 1) * 100}%`,
+          backgroundColor: barColor
+        }}
+        height="1"
+        borderRadius="medium"
+        backgroundColor="backgroundSecondary"
+        // tw="bg-primary h-1 rounded transition-all"
+      />
+    </Box>
+  );
+};
diff --git a/components/common/governance/Profile.tsx b/components/common/governance/Profile.tsx
new file mode 100644
index 00000000..f2f2f75d
--- /dev/null
+++ b/components/common/governance/Profile.tsx
@@ -0,0 +1,86 @@
+import { useWalletIdentity } from '@cardinal/namespaces-components';
+import { useConnectedWallet, useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import makeBlockie from 'ethereum-blockies-base64';
+import { FaExclamationTriangle, FaTwitter } from 'react-icons/fa';
+import { Link } from 'react-router-dom';
+
+import { useAddressImage } from '../../../hooks/cardinal/useAddressImage';
+import { useCardinalDisplayName } from '../../../hooks/cardinal/useAddressName';
+import { AddressLink } from '../AddressLink';
+import { ContentLoader } from '../ContentLoader';
+import { MouseoverTooltip } from '../MouseoverTooltip';
+
+interface Props {
+  address: PublicKey;
+  href?: string;
+}
+
+export const Profile: React.FC<Props> = ({ address, href }: Props) => {
+  const { network, connection } = useSolana();
+  const wallet = useConnectedWallet();
+  const { name, displayName } = useCardinalDisplayName(address);
+  const { addressImage, loadingImage } = useAddressImage(address);
+  const { show } = useWalletIdentity();
+  const image = (
+    <img
+      tw="h-10 w-10 rounded-full"
+      alt={`Profile of ${displayName ?? address.toString()}`}
+      src={addressImage ?? makeBlockie(address.toString())}
+    />
+  );
+  return (
+    <div tw="text-sm">
+      <div tw="flex gap-2 items-center">
+        <div tw="h-10 w-10 rounded-full flex">
+          {loadingImage ? (
+            <ContentLoader tw="h-10 w-10 rounded-full" />
+          ) : href ? (
+            <Link to={href}>{image}</Link>
+          ) : (
+            image
+          )}
+        </div>
+        <div tw="flex flex-col leading-normal">
+          <div tw="flex gap-1 items-center">
+            <div tw="h-5 flex items-center">
+              {displayName === undefined ? (
+                <ContentLoader tw="h-4 w-12 rounded" />
+              ) : (
+                <span
+                  css={[
+                    name ? tw`text-white` : tw`text-warmGray-400`,
+                    tw`font-medium`
+                  ]}
+                >
+                  {displayName}
+                </span>
+              )}
+            </div>
+            {name?.startsWith('@') && (
+              <a
+                href={`https://twitter.com/${name.slice(1)}`}
+                target="_blank"
+                rel="noreferrer"
+              >
+                <FaTwitter
+                  css={css`
+                    color: #1da1f2;
+                  `}
+                />
+              </a>
+            )}
+            {name === null && wallet && wallet.publicKey.equals(address) && (
+              <MouseoverTooltip text="Your profile is not verified. Please link your Twitter.">
+                <button onClick={() => show(wallet, connection, network)}>
+                  <FaExclamationTriangle tw="text-yellow-500" />
+                </button>
+              </MouseoverTooltip>
+            )}
+          </div>
+          <AddressLink tw="text-gray-400" address={address} showCopy />
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/helpers/utils.ts b/helpers/utils.ts
index 78440cd7..e646cc3a 100644
--- a/helpers/utils.ts
+++ b/helpers/utils.ts
@@ -18,6 +18,9 @@ import * as anchor from '@project-serum/anchor';
 import type { Network } from '@saberhq/solana-contrib';
 import type { Cluster, TransactionInstruction } from '@solana/web3.js';
 import { TokenInfo } from '@saberhq/token-utils';
+import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { SmartWalletTransactionData } from '@gokiprotocol/client';
+import BN from 'bn.js';
 
 export const convertArrayToObject = (array: any[], key: string) => {
   const initialValue = {};
@@ -356,6 +359,17 @@ export function shortenAddress(address: string, chars = 5): string {
   )}`;
 }
 
+/**
+ * Converts a Solana timestamp to a Date.
+ *
+ * @param num
+ * @returns
+ */
+export const tsToDate = (num: BN): Date => new Date(num.toNumber() * 1_000);
+
+export const gokiTXLink = (tx: SmartWalletTransactionData) =>
+  `https://goki.so/#/wallets/${tx.smartWallet.toString()}/tx/${tx.index.toString()}`;
+
 export function addressLabel(
   address: string,
   tokenRegistry?: Map<string, TokenInfo>
@@ -371,3 +385,12 @@ export function addressLabel(
 export function displayAddress(address: string, shorten = true): string {
   return addressLabel(address) ?? (shorten ? shortenAddress(address) : address);
 }
+
+export const sideColor = (side: VoteSide) =>
+  side === VoteSide.For
+    ? `colors.primary`
+    : side === VoteSide.Against
+    ? `colors.red.500`
+    : side === VoteSide.Abstain
+    ? `colors.yellow.500`
+    : `colors.transparent`;
diff --git a/hooks/tribeca/useEscrow.ts b/hooks/tribeca/useEscrow.ts
index a92b87b8..0b935d6d 100644
--- a/hooks/tribeca/useEscrow.ts
+++ b/hooks/tribeca/useEscrow.ts
@@ -48,7 +48,7 @@ export const useEscrow = (owner?: PublicKey) => {
       const escrowW = new VoteEscrow(
         tribecaMut,
         lockerKey,
-        governor,
+        governor!,
         escrow.publicKey,
         owner
       );
diff --git a/hooks/useParsedTX.ts b/hooks/useParsedTX.ts
new file mode 100644
index 00000000..1546ee0b
--- /dev/null
+++ b/hooks/useParsedTX.ts
@@ -0,0 +1,85 @@
+import { SuperCoder } from '@saberhq/anchor-contrib';
+import { useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import { startCase } from 'lodash';
+import { useEffect } from 'react';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import { parseNonAnchorInstruction } from 'helpers/instructions/parseNonAnchorInstruction';
+import { useGokiTransactionData } from 'helpers/parser';
+import { displayAddress, programLabel } from 'helpers/utils';
+import { useIDLs } from './useIDLs';
+import type { ParsedInstruction } from './useSmartWallet';
+import { useTXAddress } from './useTXAddress';
+
+export const useParsedTX = (smartWalletKey: PublicKey, index: number) => {
+  const { data: key } = useTXAddress(smartWalletKey, index);
+  return useParsedTXByKey(key);
+};
+
+export const useParsedTXByKey = (key: PublicKey | undefined) => {
+  const { network } = useSolana();
+  const { data: txData, isLoading: loading } = useGokiTransactionData(key);
+  const idls = useIDLs(
+    txData?.account.instructions.map(ix => ix.programId) ?? []
+  );
+
+  const query = useQuery(
+    ['parsedTX', network, key],
+    () => {
+      invariant(txData);
+      const instructions: ParsedInstruction[] = txData.account.instructions
+        .map(rawIx => ({
+          ...rawIx,
+          data: Buffer.from(rawIx.data)
+        }))
+        .map((ix): Omit<ParsedInstruction, 'title'> => {
+          const idl = idls.find(theIDL =>
+            theIDL.data?.programID.equals(ix.programId)
+          )?.data?.idl;
+          const label = programLabel(ix.programId.toString());
+          if (idl) {
+            const superCoder = new SuperCoder(ix.programId, {
+              ...idl,
+              instructions: idl.instructions.concat(idl.state?.methods ?? [])
+            });
+            return {
+              programName: label ?? startCase(idl.name),
+              ix,
+              parsed: { ...superCoder.parseInstruction(ix), anchor: true }
+            };
+          }
+          const parsedNonAnchor = parseNonAnchorInstruction(ix);
+          return { ix, programName: label, parsed: parsedNonAnchor };
+        })
+        .map(
+          (ix): ParsedInstruction => ({
+            ...ix,
+            title: `${
+              ix.programName ?? displayAddress(ix.ix.programId.toString())
+            }: ${startCase(
+              (ix.parsed && 'name' in ix.parsed ? ix.parsed.name : null) ??
+                'Unknown Instruction'
+            )}`
+          })
+        );
+      return {
+        tx: txData,
+        index: txData.account.index.toNumber(),
+        instructions
+      };
+    },
+    {
+      enabled: !!txData
+    }
+  );
+
+  useEffect(() => {
+    if (txData && !query.isFetching) {
+      void query.refetch();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [txData]);
+  return { ...query, isLoading: query.isLoading || loading };
+};
diff --git a/hooks/useSmartWallet.ts b/hooks/useSmartWallet.ts
new file mode 100644
index 00000000..db506815
--- /dev/null
+++ b/hooks/useSmartWallet.ts
@@ -0,0 +1,209 @@
+import type {
+  SmartWalletData,
+  SmartWalletTransactionData,
+  SmartWalletTypes,
+  SmartWalletWrapper
+} from '@gokiprotocol/client';
+import {
+  findTransactionAddress,
+  GOKI_ADDRESSES,
+  SmartWalletJSON
+} from '@gokiprotocol/client';
+import type { InstructionParsed } from '@saberhq/anchor-contrib';
+import { SuperCoder } from '@saberhq/anchor-contrib';
+import type { ProgramAccount } from '@saberhq/token-utils';
+import type { TransactionInstruction } from '@solana/web3.js';
+import { PublicKey } from '@solana/web3.js';
+import { startCase, uniq } from 'lodash';
+import { useEffect, useMemo, useState } from 'react';
+import { createContainer } from 'unstated-next';
+
+import { useSDK } from 'helpers/sdk';
+import type { ParsedNonAnchorInstruction } from 'helpers/instructions/parseNonAnchorInstruction';
+import {
+  InstructionParseError,
+  parseNonAnchorInstruction
+} from 'helpers/instructions/parseNonAnchorInstruction';
+import {
+  useBatchedGokiTransactions,
+  useGokiSmartWalletData
+} from 'helpers/parser';
+import { displayAddress, programLabel } from 'helpers/utils';
+import { useIDLs } from './useIDLs';
+
+export const SMART_WALLET_CODER = new SuperCoder<SmartWalletTypes>(
+  GOKI_ADDRESSES.SmartWallet,
+  SmartWalletJSON
+);
+
+export interface ParsedInstruction {
+  ix: TransactionInstruction;
+  parsed?:
+    | ParsedNonAnchorInstruction
+    | ({ anchor: true } & InstructionParsed)
+    | { error: InstructionParseError }
+    | null;
+  programName?: string;
+  title: string;
+}
+
+export interface ParsedTX {
+  tx: ProgramAccount<SmartWalletTransactionData>;
+  index: number;
+  instructions: ParsedInstruction[];
+}
+
+const useSmartWalletInner = (
+  key?: PublicKey
+): {
+  key: PublicKey;
+  smartWallet: SmartWalletWrapper | null;
+  smartWalletData?: ProgramAccount<SmartWalletData> | null;
+  parsedTXs?: ParsedTX[];
+  threshold?: number;
+  path: string;
+} => {
+  if (!key) {
+    throw new Error('missing key');
+  }
+  const { sdkMut } = useSDK();
+
+  const { data: smartWalletData } = useGokiSmartWalletData(key);
+  const [smartWallet, setSmartWallet] = useState<SmartWalletWrapper | null>(
+    null
+  );
+
+  const [txAddrs, setTxAddrs] = useState<PublicKey[]>([]);
+  const { data: txs } = useBatchedGokiTransactions(txAddrs);
+
+  useEffect(() => {
+    if (!smartWalletData) {
+      setTxAddrs([]);
+      return;
+    }
+    void (async () => {
+      const numTransactions =
+        smartWalletData.account.numTransactions.toNumber();
+      if (numTransactions) {
+        const txAddrs = await Promise.all(
+          Array(numTransactions)
+            .fill(null)
+            .map(async (_, i) => {
+              const [key] = await findTransactionAddress(
+                smartWalletData.publicKey,
+                i
+              );
+              return key;
+            })
+        );
+        setTxAddrs(txAddrs);
+      }
+    })();
+  }, [key, smartWalletData]);
+
+  useEffect(() => {
+    if (!sdkMut) {
+      setSmartWallet(null);
+      return;
+    }
+    void (async () => {
+      const sw = await sdkMut.loadSmartWallet(key);
+      setSmartWallet(sw);
+    })();
+  }, [key, sdkMut]);
+
+  const programIDsToFetch = useMemo(
+    () =>
+      uniq(
+        txs
+          ?.flatMap(tx =>
+            tx?.account.instructions.map(ix => ix.programId.toString())
+          )
+          .filter((x): x is string => !!x)
+      ),
+    [txs]
+  );
+
+  const idls = useIDLs(programIDsToFetch.map(p => new PublicKey(p)));
+
+  const parsedTXs = useMemo(() => {
+    return txs
+      ?.filter((tx): tx is ProgramAccount<SmartWalletTransactionData> => !!tx)
+      .map((tx): ParsedTX => {
+        const index = tx.account.index.toNumber();
+        const instructions: ParsedInstruction[] = tx.account.instructions
+          .map(rawIx => ({
+            ...rawIx,
+            data: Buffer.from(rawIx.data)
+          }))
+          .map((ix): Omit<ParsedInstruction, 'title'> => {
+            const idlIndex = programIDsToFetch.findIndex(
+              pid => pid === ix.programId.toString()
+            );
+            const idl = idls[idlIndex]?.data?.idl;
+            const label = programLabel(ix.programId.toString());
+            if (idl) {
+              const superCoder = new SuperCoder(ix.programId, {
+                ...idl,
+                instructions: idl.instructions.concat(idl.state?.methods ?? [])
+              });
+
+              const common = {
+                programName: label ?? startCase(idl.name),
+                ix
+              };
+
+              try {
+                const ixParsed = superCoder.parseInstruction(ix);
+                return {
+                  ...common,
+                  parsed: {
+                    ...ixParsed,
+                    anchor: true
+                  }
+                };
+              } catch (e) {
+                return {
+                  ...common,
+                  parsed: { error: new InstructionParseError(ix, e) }
+                };
+              }
+            }
+            const parsedNonAnchor = parseNonAnchorInstruction(ix);
+            return { ix, programName: label, parsed: parsedNonAnchor };
+          })
+          .map(
+            (ix): ParsedInstruction => ({
+              ...ix,
+              title: `${
+                ix.programName ?? displayAddress(ix.ix.programId.toString())
+              }: ${startCase(
+                (ix.parsed && 'name' in ix.parsed ? ix.parsed.name : null) ??
+                  'Unknown Instruction'
+              )}`
+            })
+          );
+        return { tx, index, instructions };
+      })
+      .sort((a, b) => {
+        const aIndex = a.index;
+        const bIndex = b.index;
+        if (aIndex !== undefined && bIndex !== undefined) {
+          return aIndex < bIndex ? 1 : -1;
+        }
+        if (aIndex !== undefined && bIndex === undefined) {
+          return -1;
+        }
+        return 1;
+      });
+  }, [idls, programIDsToFetch, txs]);
+
+  const threshold = smartWalletData?.account.threshold.toNumber();
+
+  const path = `/wallets/${key.toString()}`;
+
+  return { key, smartWallet, smartWalletData, parsedTXs, threshold, path };
+};
+
+export const { useContainer: useSmartWallet, Provider: SmartWalletProvider } =
+  createContainer(useSmartWalletInner);
diff --git a/hooks/useTXAddress.ts b/hooks/useTXAddress.ts
new file mode 100644
index 00000000..23c72c03
--- /dev/null
+++ b/hooks/useTXAddress.ts
@@ -0,0 +1,13 @@
+import { findTransactionAddress } from '@gokiprotocol/client';
+import type { PublicKey } from '@solana/web3.js';
+import { useQuery } from 'react-query';
+
+export const useTXAddress = (smartWalletKey: PublicKey, index: number) => {
+  return useQuery(
+    ['parsedTXAddress', smartWalletKey.toString(), index],
+    async () => {
+      const [txKey] = await findTransactionAddress(smartWalletKey, index);
+      return txKey;
+    }
+  );
+};
diff --git a/pages/governance/proposals/[proposalIndex]/index.tsx b/pages/governance/proposals/[proposalIndex]/index.tsx
new file mode 100644
index 00000000..9fb5837a
--- /dev/null
+++ b/pages/governance/proposals/[proposalIndex]/index.tsx
@@ -0,0 +1,13 @@
+import { NextPage } from 'next';
+import Layout from 'components/Layout/Layout';
+import { ProposalIndexView } from 'components/Proposals/ProposalIndexView';
+
+const Proposals: NextPage = () => {
+  return (
+    <Layout>
+      <ProposalIndexView />
+    </Layout>
+  );
+};
+
+export default Proposals;
diff --git a/pages/governance/proposals/index.tsx b/pages/governance/proposals/index.tsx
index da5ce804..75d4ec65 100644
--- a/pages/governance/proposals/index.tsx
+++ b/pages/governance/proposals/index.tsx
@@ -4,7 +4,7 @@ import { ProposalsList } from 'components/Proposals/ProposalsList';
 import Layout from 'components/Layout/Layout';
 
 const Proposals: NextPage = () => {
-  const [showDrafts, setShowDrafts] = useState(false);
+  const [showDrafts, setShowDrafts] = useState(true);
 
   return (
     <Layout>

From 0b8acdb8a6dd3b70d88da08e8e6dbfc09fec2203 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 17 May 2022 04:33:22 -0500
Subject: [PATCH 005/101] Upgrade locker program

---
 components/HoneyModal/HoneyModal.tsx          |  6 ++--
 components/PHoneyModal/PHoneyModal.tsx        |  6 ++--
 .../locked-voter/actions/ProposalActivate.tsx |  2 +-
 components/Proposals/ProposalsList/index.tsx  |  2 +-
 components/VeHoneyModal/VeHoneyModal.tsx      |  4 +--
 hooks/tribeca/useEscrow.ts                    |  7 ++++-
 hooks/useStake.tsx                            | 14 ++++++---
 pages/_app.tsx                                |  9 ++++--
 pages/governance/index.tsx                    | 29 +++----------------
 9 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/components/HoneyModal/HoneyModal.tsx b/components/HoneyModal/HoneyModal.tsx
index 82266097..69abd2f0 100644
--- a/components/HoneyModal/HoneyModal.tsx
+++ b/components/HoneyModal/HoneyModal.tsx
@@ -38,11 +38,11 @@ const HoneyModal = () => {
   // ======================== Should replace with configuration ================
   const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
   const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_STAKE_POOL_ADDR ||
+    process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
       '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
   );
   const LOCKER_ADDRESS = new PublicKey(
-    process.env.NEXT_LOCKER_ADDR ||
+    process.env.NEXT_PUBLIC_LOCKER_ADDR ||
       '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
   );
   // ============================================================================
@@ -139,7 +139,7 @@ const HoneyModal = () => {
                   onChange={event =>
                     setVestingPeriod(Number(event.target.value))
                   }
-                > 
+                >
                   <option value="1">1 month</option>
                   <option value="3">3 months</option>
                   <option value="6">6 months</option>
diff --git a/components/PHoneyModal/PHoneyModal.tsx b/components/PHoneyModal/PHoneyModal.tsx
index 3db70d92..449c88fe 100644
--- a/components/PHoneyModal/PHoneyModal.tsx
+++ b/components/PHoneyModal/PHoneyModal.tsx
@@ -6,7 +6,7 @@ import { useAccounts } from 'hooks/useAccounts';
 import { PHONEY_DECIMALS, PHONEY_MINT } from 'helpers/sdk/constant';
 import { convert, convertToBN } from 'helpers/utils';
 
-// console.log("The stake pool address is : ", process.env.PUBLIC_NEXT_STAKE_POOL_ADDRESS)
+// console.log("The stake pool address is : ", process.env.PUBLIC_NEXT_PUBLIC_STAKE_POOL_ADDRESS)
 const PHoneyModal = () => {
   const [amount, setAmount] = useState<number>(0);
   const [isClaimable, setIsClaimable] = useState<boolean>(false);
@@ -22,11 +22,11 @@ const PHoneyModal = () => {
   // ======================== Should replace with configuration ================
   const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
   const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_STAKE_POOL_ADDR ||
+    process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
       '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
   );
   const LOCKER_ADDRESS = new PublicKey(
-    process.env.NEXT_LOCKER_ADDR ||
+    process.env.NEXT_PUBLIC_LOCKER_ADDR ||
       '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
   );
   // ============================================================================
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
index 3f5a70e2..3e2df3c7 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
@@ -103,7 +103,7 @@ export const ProposalActivate: React.FC<Props> = ({
             </Button>
           </Box>
         ) : (
-          <Box display="flex" flexDirection="column" gap="4">
+          <Box display="flex" flexDirection="column" gap="4" width="full">
             <Text as="p">
               You must have at least{' '}
               <strong>{minActivationThreshold?.formatUnits()}</strong> to
diff --git a/components/Proposals/ProposalsList/index.tsx b/components/Proposals/ProposalsList/index.tsx
index cb31f7c0..3f3db7dc 100644
--- a/components/Proposals/ProposalsList/index.tsx
+++ b/components/Proposals/ProposalsList/index.tsx
@@ -101,7 +101,7 @@ export const ProposalsList: React.FC<Props> = ({
       <div>
         <EmptyState title="There aren't any proposals yet.">
           <Text>
-            <Link href={`proposals/create`} passHref>
+            <Link href={'/governance/proposals/create'} passHref>
               Create a proposal
             </Link>
           </Text>
diff --git a/components/VeHoneyModal/VeHoneyModal.tsx b/components/VeHoneyModal/VeHoneyModal.tsx
index 4bf0ec30..8b3f6c14 100644
--- a/components/VeHoneyModal/VeHoneyModal.tsx
+++ b/components/VeHoneyModal/VeHoneyModal.tsx
@@ -55,11 +55,11 @@ const VeHoneyModal = () => {
   // ======================== Should replace with configuration ================
   const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
   const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_STAKE_POOL_ADDR ||
+    process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
       '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
   );
   const LOCKER_ADDRESS = new PublicKey(
-    process.env.NEXT_LOCKER_ADDR ||
+    process.env.NEXT_PUBLIC_LOCKER_ADDR ||
       '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
   );
   // ============================================================================
diff --git a/hooks/tribeca/useEscrow.ts b/hooks/tribeca/useEscrow.ts
index 0b935d6d..0eeb9e6b 100644
--- a/hooks/tribeca/useEscrow.ts
+++ b/hooks/tribeca/useEscrow.ts
@@ -37,10 +37,15 @@ export const useEscrow = (owner?: PublicKey) => {
       enabled: !!(lockerKey && owner)
     }
   );
-  const { data: escrow, isLoading: isEscrowLoading } = useEscrowData(escrowKey);
 
+  const {
+    data: escrow,
+    isLoading: isEscrowLoading,
+    ...rest
+  } = useEscrowData(escrowKey);
   const canLoadEscrow =
     !!governorData && !!(lockerKey && owner && tribecaMut && escrow);
+  console.log(canLoadEscrow, rest);
   const result = useQuery(
     ['escrow', escrow?.publicKey.toString()],
     async () => {
diff --git a/hooks/useStake.tsx b/hooks/useStake.tsx
index e933c404..03e4c66f 100644
--- a/hooks/useStake.tsx
+++ b/hooks/useStake.tsx
@@ -70,10 +70,10 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
         const [userKey] = await sc.getUserPDA(stakePool);
         // console.log('user key: ', userKey.toString());
         const user = await sc.fetchPoolUser(userKey);
-        const lockerAcc = await vc.fetchLocker(locker);
+        const lockerAcc = await vc.fetchLockerV2(locker);
         const [escrowKey] = await vc.getEscrowPDA(locker);
         // console.log('escrow: ', escrowKey.toString());
-        const escrow = await vc.fetchEscrow(escrowKey);
+        const escrow = await vc.fetchEscrowV2(escrowKey);
 
         setPool(pool);
         setUserKey(userKey);
@@ -197,7 +197,13 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
       if (sc && vc && userKey && honeyToken) {
         setIsLoading(true);
         try {
-          await vc.lock(locker, honeyToken.pubkey, amount, duration, hasEscrow);
+          await vc.lockV2(
+            locker,
+            honeyToken.pubkey,
+            amount,
+            duration,
+            hasEscrow
+          );
           toast.success('HONEY successfully vested');
           setIsLoading(false);
         } catch (e) {
@@ -215,7 +221,7 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
     if (vc) {
       setIsLoading(true);
       try {
-        await vc.unlockEscrow(locker, escrowKey, honeyToken?.pubkey);
+        await vc.unlockEscrowV2(locker, escrowKey, honeyToken?.pubkey);
         setIsLoading(false);
       } catch (e) {
         console.log(e);
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 3f5fdc42..61d78f5e 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -10,7 +10,7 @@ import { ThemeProvider } from 'degen';
 import { ToastContainer } from 'react-toastify';
 import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
 import SecPopup from 'components/SecPopup';
-import { GOVERNOR_ADDRESS, SDKProvider } from 'helpers/sdk';
+import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
 
 import 'degen/styles';
 import '../styles/globals.css';
@@ -61,7 +61,12 @@ function MyApp({ Component, pageProps }: AppProps) {
         >
           <SailProvider>
             <SDKProvider>
-              <GovernorProvider initialState={{ governor: GOVERNOR_ADDRESS }}>
+              <GovernorProvider
+                initialState={{
+                  governor: GOVERNOR_ADDRESS,
+                  govToken: HONEY_MINT
+                }}
+              >
                 {/* {children} */}
                 {showPopup ? (
                   <SecPopup setShowPopup={setShowPopup} />
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 5246fb69..5373b8c2 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -37,6 +37,7 @@ import {
   calcVeHoneyAmount
 } from 'helpers/utils';
 import { HIPS } from 'constants/hip-links';
+import { ProposalsList } from 'components/Proposals/ProposalsList';
 
 const Governance: NextPage = () => {
   const wallet = useConnectedWallet();
@@ -52,11 +53,11 @@ const Governance: NextPage = () => {
   const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
 
   const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_STAKE_POOL_ADDR ||
+    process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
       'Cv9Hx3VRvqkz5JRPiZM8A2BH31yvpcT4qiUJLdtgu7TE'
   );
   const LOCKER_ADDRESS = new PublicKey(
-    process.env.NEXT_LOCKER_ADDR ||
+    process.env.NEXT_PUBLIC_LOCKER_ADDR ||
       '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
   );
   // ============================================================================
@@ -363,29 +364,7 @@ const Governance: NextPage = () => {
           >
             Recent Proposals
           </Text>
-          <Stack>
-            {HIPS.map(hip => (
-              <Box
-                as="a"
-                href={hip.link}
-                target="blank"
-                cursor="pointer"
-                key={hip.link}
-              >
-                <Card hover padding="5">
-                  <Stack align="center" direction="horizontal">
-                    <Stack flex={1}>
-                      <Text weight="bold" size="large">
-                        {hip.title}
-                      </Text>
-                      <Tag hover>{hip.date}</Tag>
-                    </Stack>
-                    <IconChevronRight color="text" />
-                  </Stack>
-                </Card>
-              </Box>
-            ))}
-          </Stack>
+          <ProposalsList maxCount={3} />
         </Box>
       </Stack>
     </Layout>

From b1b793ebe5a01b84b817c6017cd4d2489df734c5 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 17 May 2022 07:41:05 -0500
Subject: [PATCH 006/101] Fix build error

---
 .../locked-voter/ProposalCreateInner.tsx          |  8 +-------
 .../locked-voter/ProposalTXForm.tsx               |  4 ++--
 .../locked-voter/actions/ProposalExecute.tsx      | 15 ++++++---------
 hooks/tribeca/useGovernor.ts                      | 13 +++++++++++++
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
index 9b677e16..dad142a5 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -6,19 +6,13 @@ import {
 } from '@saberhq/sail';
 import { LAMPORTS_PER_SOL, SystemProgram, Transaction } from '@solana/web3.js';
 import ReactMarkdown from 'react-markdown';
+import { Box, Button, Card, Heading, Input, Textarea, Text } from 'degen';
 
 import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
 import { useGovernor } from 'hooks/tribeca/useGovernor';
-// import { AsyncButton } from '../../../../../common/AsyncButton';
-// import { Button } from '../../../../../common/Button';
-// import { Card } from '../../../../../common/governance/Card';
-// import { HelperCard } from '../../../../../common/HelperCard';
-// import { InputText, Textarea } from '../../../../../common/inputs/InputText';
-// import { LabeledInput } from '../../../../../common/inputs/LabeledInput';
 import { ProposalConfirmModal } from './ProposalConfirmationModal';
 import { ProposalTXForm } from './ProposalTXForm';
 import { HelperCard } from 'components/common/HelperCard';
-import { Box, Button, Card, Heading, Input, Textarea, Text } from 'degen';
 import { AsyncButton } from 'components/AsyncButton';
 
 export const ProposalCreateInner: React.FC = () => {
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
index c09d95ce..59853ad8 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
@@ -21,7 +21,7 @@ export const ProposalTXForm: React.FC<Props> = ({
   setTxRaw
 }: Props) => {
   const [actionType, setActionType] = useState<ActionType>('Upgrade Program');
-  const { meta, smartWallet, lockerData, governor } = useGovernor();
+  const { smartWallet, lockerData, governor } = useGovernor();
   const { ownerInvokerKey } = useExecutiveCouncil();
 
   if (!smartWallet || !ownerInvokerKey) {
@@ -29,7 +29,7 @@ export const ProposalTXForm: React.FC<Props> = ({
   }
 
   const actor = smartWallet;
-  const ctx = { ...meta, locker: lockerData?.publicKey, governor };
+  const ctx = { locker: lockerData?.publicKey, governor };
 
   const currentAction = ACTIONS.find(action => action.title === actionType);
 
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
index aed8ce70..f3997069 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
@@ -1,21 +1,18 @@
 import { mapSome, useTXHandlers } from '@saberhq/sail';
-import { TransactionInstruction } from '@solana/web3.js';
 // import pluralize from 'pluralize';
 import Countdown from 'react-countdown';
-import invariant from 'tiny-invariant';
 
-import { useSDK } from 'helpers/sdk';
+// import { useSDK } from 'helpers/sdk';
 import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
-import { useGovernor } from 'hooks/tribeca/useGovernor';
+// import { useGovernor } from 'hooks/tribeca/useGovernor';
 import type { ProposalInfo } from 'hooks/tribeca/useProposals';
 import { useGokiTransactionData } from 'helpers/parser';
-import { gokiTXLink, tsToDate } from 'helpers/utils';
+import { tsToDate } from 'helpers/utils';
 // import { AsyncConfirmButton } from '../../../../../../common/AsyncConfirmButton';
 // import { Card } from '../../../../../../common/governance/Card';
 // import { ExternalLink } from '../../../../../../common/typography/ExternalLink';
 // import { ProseSmall } from '../../../../../../common/typography/Prose';
 // import { ExecuteProposalButton } from '../../../../GovernanceManageView/tabs/ExecutiveCouncilTab/ExecuteProposalButton';
-import { EmbedTX } from '../EmbedTX';
 import { Card } from 'components/common/governance/Card';
 import { Box, Text } from 'degen';
 import Link from 'next/link';
@@ -29,9 +26,9 @@ export const ProposalExecute: React.FC<Props> = ({
   proposal,
   onActivate
 }: Props) => {
-  const { governorW, smartWallet, manifest } = useGovernor();
-  const emergencyDAO = manifest?.addresses?.['emergency-dao']?.address;
-  const { sdkMut } = useSDK();
+  // const { governorW, smartWallet } = useGovernor();
+  // const emergencyDAO = manifest?.addresses?.['emergency-dao']?.address;
+  // const { sdkMut } = useSDK();
   const { ecWallet, isMemberOfEC } = useExecutiveCouncil();
   const { data: gokiTransactionData } = useGokiTransactionData(
     proposal.proposalData.queuedTransaction
diff --git a/hooks/tribeca/useGovernor.ts b/hooks/tribeca/useGovernor.ts
index b0c91a68..ae6538ad 100644
--- a/hooks/tribeca/useGovernor.ts
+++ b/hooks/tribeca/useGovernor.ts
@@ -149,7 +149,20 @@ const useGovernorInner = (props: GovernorProps | undefined) => {
     ? governorData.account.smartWallet
     : governorData;
 
+  const manifest = {
+    governor,
+    proposals: {
+      notice:
+        'To create a proposal, first make a post on the [GGA Discord](https://discord.gg/k3UtYYzcvu).\nOnce you have determined that there is sufficient community support,\nadd the link to the discussion thread and create a proposal.\n',
+      discussion: {
+        required: true,
+        prefix: 've'
+      }
+    }
+  };
+
   return {
+    manifest,
     governor,
     governorW,
     governorData,

From f68b2275d76a2c256520ceb4b2993ea725b93b36 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 17 May 2022 08:03:20 -0500
Subject: [PATCH 007/101] Fix build error

---
 .../locked-voter/CastVoteButton/index.tsx     |  2 +-
 .../ProposalBody/GitHubComments.tsx           | 21 +++--
 .../locked-voter/ProposalHelmet.tsx           | 52 -----------
 .../ProposalIndexView/locked-voter/index.tsx  |  4 +-
 .../ProposalsList/ProposalStateBadge.tsx      | 82 ++++++++++++++----
 components/common/governance/Profile.tsx      | 86 -------------------
 hooks/tribeca/useProposals.ts                 | 13 +--
 package.json                                  |  1 +
 yarn.lock                                     | 25 ++++++
 9 files changed, 114 insertions(+), 172 deletions(-)
 delete mode 100644 components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx
 delete mode 100644 components/common/governance/Profile.tsx

diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
index 47ef4849..b2f0faba 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
@@ -17,7 +17,7 @@ export const CastVoteButton: React.FC<Props> = ({
     <ModalButton
       // tw="max-w-md"
       buttonProps={{
-        variant: 'outline'
+        variant: 'tertiary'
         // css: tw`border-white w-2/5 hover:(border-primary bg-primary bg-opacity-20)`
       }}
       buttonLabel={
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx
index 134797a1..b45a8454 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx
@@ -1,3 +1,4 @@
+import Image from 'next/image';
 import { Box, Stack, Text } from 'degen';
 import formatDistance from 'date-fns/formatDistance';
 
@@ -18,9 +19,9 @@ export const GitHubComments: React.FC<Props> = ({ issue }: Props) => {
       <Stack space="4">
         {githubComments?.map(comment => (
           <Box key={comment.id} display="flex" width="full" gap="4">
-            <img
+            <Image
               src={comment.user?.avatar_url ?? ''}
-              tw="w-8 h-8 rounded-full"
+              // tw="w-8 h-8 rounded-full"
               alt={`Profile of ${comment.user?.login ?? ''}`}
             />
             <Box
@@ -58,13 +59,15 @@ export const GitHubComments: React.FC<Props> = ({ issue }: Props) => {
           </Box>
         ))}
       </Stack>
-      <div tw="w-full text-center py-8">
-        Got something to say? Add a comment to the{' '}
-        <a href={issue.html_url} target="_blank" rel="noreferrer">
-          proposal on GitHub
-        </a>
-        .
-      </div>
+      <Box width="full" textAlign="center" paddingY="8">
+        <Text>
+          Got something to say? Add a comment to the{' '}
+          <a href={issue.html_url} target="_blank" rel="noreferrer">
+            proposal on GitHub
+          </a>
+          .
+        </Text>
+      </Box>
       {/* </ProseSmall> */}
     </Card>
   );
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx
deleted file mode 100644
index 727184c4..00000000
--- a/components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Helmet } from "react-helmet";
-
-import { useCardinalName } from "../../../../../../hooks/cardinal/useAddressName";
-import { useGovernor } from "../../../../../../hooks/tribeca/useGovernor";
-import type { ProposalInfo } from "../../../../../../hooks/tribeca/useProposals";
-import { tsToDate } from "../../../../../../utils/utils";
-
-interface Props {
-  proposalInfo: ProposalInfo;
-}
-
-export const ProposalHelmet: React.FC<Props> = ({ proposalInfo }: Props) => {
-  const { daoName } = useGovernor();
-  const { index } = proposalInfo;
-
-  const cardinalName = useCardinalName(proposalInfo.proposalData.proposer);
-  const author = cardinalName ?? proposalInfo.proposalData.proposer.toString();
-  const twitterName = cardinalName?.startsWith("@") ? cardinalName : null;
-
-  const title = proposalInfo?.proposalMetaData
-    ? `${daoName ?? "Governance"} Proposal #${index}: ${
-        proposalInfo.proposalMetaData.title
-      }`
-    : `${daoName ?? "Governance"} Proposal #${index}`;
-
-  const description = proposalInfo.proposalMetaData
-    ? proposalInfo.proposalMetaData.descriptionLink.slice(0, 200)
-    : null;
-
-  return (
-    <Helmet>
-      <title>
-        {title} | {daoName}
-      </title>
-
-      {description && <meta name="description" content={description} />}
-      {description && <meta name="og:description" content={description} />}
-      {description && <meta name="twitter:description" content={description} />}
-
-      <meta name="og:title" content={title} />
-      <meta name="og:type" content="article" />
-      <meta
-        name="og:article:published_time"
-        content={tsToDate(proposalInfo.proposalData.createdAt).toISOString()}
-      />
-      {author && <meta name="og:article:author" content={author} />}
-
-      <meta name="twitter:title" content={title} />
-      {twitterName && <meta name="twitter:creator" content={twitterName} />}
-    </Helmet>
-  );
-};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
index 16689b4d..e35d686a 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
@@ -5,7 +5,7 @@ import { useRouter } from 'next/router';
 import { useProposal } from 'hooks/tribeca/useProposals';
 // import { ContentLoader } from '../../../../../common/ContentLoader';
 import { GovernancePage } from 'components/common/governance/GovernancePage';
-import { Profile } from 'components/common/governance/Profile';
+// import { Profile } from 'components/common/governance/Profile';
 // import { PlaceholderSubtitle } from '../../../GovernanceOverviewView/locked-voter/ProposalsList/PlaceholderCard';
 // import { ProposalSubtitle } from '../../../GovernanceOverviewView/locked-voter/ProposalsList/ProposalSubtitle';
 import { ProposalActivate } from './actions/ProposalActivate';
@@ -13,7 +13,7 @@ import { ProposalExecute } from './actions/ProposalExecute';
 import { ProposalQueue } from './actions/ProposalQueue';
 import { ProposalVote } from './actions/ProposalVote';
 import { ProposalDetails } from './ProposalDetails';
-import { ProposalHelmet } from './ProposalHelmet';
+// import { ProposalHelmet } from './ProposalHelmet';
 import { ProposalHistory } from './ProposalHistory';
 import { VotesCard } from './VotesCard';
 import { Box, Stack, Text } from 'degen';
diff --git a/components/Proposals/ProposalsList/ProposalStateBadge.tsx b/components/Proposals/ProposalsList/ProposalStateBadge.tsx
index caef46c2..8310b7dc 100644
--- a/components/Proposals/ProposalsList/ProposalStateBadge.tsx
+++ b/components/Proposals/ProposalsList/ProposalStateBadge.tsx
@@ -1,6 +1,13 @@
 import { ProposalState } from '@tribecahq/tribeca-sdk';
 import { startCase } from 'lodash';
-import { IconCheck, IconPencil, IconClose, IconRefresh } from 'degen';
+import {
+  IconCheck,
+  IconPencil,
+  IconClose,
+  IconRefresh,
+  Box,
+  Text
+} from 'degen';
 import type { ProposalStatus } from 'hooks/tribeca/useProposals';
 
 interface Props {
@@ -20,28 +27,64 @@ const getStateIcon = (state: ProposalState): React.ReactNode => {
   switch (state) {
     case ProposalState.Active:
       return (
-        <div tw="bg-accent text-white h-6 w-6 rounded-full flex items-center justify-center">
-          <IconRefresh />
-        </div>
+        <Box
+          borderRadius="full"
+          color="white"
+          display="flex"
+          alignItems="center"
+          justifyContent="center"
+          backgroundColor="accent"
+          width="6"
+          height="6"
+        >
+          <IconRefresh size="6" />
+        </Box>
       );
     case ProposalState.Canceled:
     case ProposalState.Defeated:
       return (
-        <div tw="bg-gray-500 text-white h-6 w-6 rounded-full flex items-center justify-center">
-          <IconClose />
-        </div>
+        <Box
+          borderRadius="full"
+          color="white"
+          display="flex"
+          alignItems="center"
+          justifyContent="center"
+          backgroundColor="accentSecondary"
+          width="6"
+          height="6"
+        >
+          <IconClose size="6" />
+        </Box>
       );
     case ProposalState.Draft:
       return (
-        <div tw="bg-gray-500 text-white h-6 w-6 rounded-full flex items-center justify-center">
-          <IconPencil />
-        </div>
+        <Box
+          borderRadius="full"
+          color="white"
+          display="flex"
+          alignItems="center"
+          justifyContent="center"
+          backgroundColor="accentSecondary"
+          width="6"
+          height="6"
+        >
+          <IconPencil size="6" />
+        </Box>
       );
     default:
       return (
-        <div tw="bg-primary text-white h-6 w-6 rounded-full flex items-center justify-center">
-          <IconCheck />
-        </div>
+        <Box
+          borderRadius="full"
+          color="white"
+          display="flex"
+          alignItems="center"
+          justifyContent="center"
+          backgroundColor="accent"
+          width="6"
+          height="6"
+        >
+          <IconCheck size="6" />
+        </Box>
       );
   }
 };
@@ -49,11 +92,16 @@ const getStateIcon = (state: ProposalState): React.ReactNode => {
 export const ProposalStateBadge: React.FC<Props> = ({ status }: Props) => {
   const { executed, state } = status;
   return (
-    <div tw="flex flex-col items-center gap-1 lg:(flex-row gap-5)">
+    <Box
+      display="flex"
+      flexDirection={{ lg: 'row', md: 'column' }}
+      alignItems="center"
+      gap={{ lg: '5', md: '1' }}
+    >
       {getStateIcon(state)}
-      <span tw="text-xs md:text-sm text-white">
+      <Text as="span" size="small" color="white">
         {startCase(executed ? 'executed' : STATE_LABELS[state])}
-      </span>
-    </div>
+      </Text>
+    </Box>
   );
 };
diff --git a/components/common/governance/Profile.tsx b/components/common/governance/Profile.tsx
deleted file mode 100644
index f2f2f75d..00000000
--- a/components/common/governance/Profile.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import { useWalletIdentity } from '@cardinal/namespaces-components';
-import { useConnectedWallet, useSolana } from '@saberhq/use-solana';
-import type { PublicKey } from '@solana/web3.js';
-import makeBlockie from 'ethereum-blockies-base64';
-import { FaExclamationTriangle, FaTwitter } from 'react-icons/fa';
-import { Link } from 'react-router-dom';
-
-import { useAddressImage } from '../../../hooks/cardinal/useAddressImage';
-import { useCardinalDisplayName } from '../../../hooks/cardinal/useAddressName';
-import { AddressLink } from '../AddressLink';
-import { ContentLoader } from '../ContentLoader';
-import { MouseoverTooltip } from '../MouseoverTooltip';
-
-interface Props {
-  address: PublicKey;
-  href?: string;
-}
-
-export const Profile: React.FC<Props> = ({ address, href }: Props) => {
-  const { network, connection } = useSolana();
-  const wallet = useConnectedWallet();
-  const { name, displayName } = useCardinalDisplayName(address);
-  const { addressImage, loadingImage } = useAddressImage(address);
-  const { show } = useWalletIdentity();
-  const image = (
-    <img
-      tw="h-10 w-10 rounded-full"
-      alt={`Profile of ${displayName ?? address.toString()}`}
-      src={addressImage ?? makeBlockie(address.toString())}
-    />
-  );
-  return (
-    <div tw="text-sm">
-      <div tw="flex gap-2 items-center">
-        <div tw="h-10 w-10 rounded-full flex">
-          {loadingImage ? (
-            <ContentLoader tw="h-10 w-10 rounded-full" />
-          ) : href ? (
-            <Link to={href}>{image}</Link>
-          ) : (
-            image
-          )}
-        </div>
-        <div tw="flex flex-col leading-normal">
-          <div tw="flex gap-1 items-center">
-            <div tw="h-5 flex items-center">
-              {displayName === undefined ? (
-                <ContentLoader tw="h-4 w-12 rounded" />
-              ) : (
-                <span
-                  css={[
-                    name ? tw`text-white` : tw`text-warmGray-400`,
-                    tw`font-medium`
-                  ]}
-                >
-                  {displayName}
-                </span>
-              )}
-            </div>
-            {name?.startsWith('@') && (
-              <a
-                href={`https://twitter.com/${name.slice(1)}`}
-                target="_blank"
-                rel="noreferrer"
-              >
-                <FaTwitter
-                  css={css`
-                    color: #1da1f2;
-                  `}
-                />
-              </a>
-            )}
-            {name === null && wallet && wallet.publicKey.equals(address) && (
-              <MouseoverTooltip text="Your profile is not verified. Please link your Twitter.">
-                <button onClick={() => show(wallet, connection, network)}>
-                  <FaExclamationTriangle tw="text-yellow-500" />
-                </button>
-              </MouseoverTooltip>
-            )}
-          </div>
-          <AddressLink tw="text-gray-400" address={address} showCopy />
-        </div>
-      </div>
-    </div>
-  );
-};
diff --git a/hooks/tribeca/useProposals.ts b/hooks/tribeca/useProposals.ts
index 77cc5de2..e7f54c13 100644
--- a/hooks/tribeca/useProposals.ts
+++ b/hooks/tribeca/useProposals.ts
@@ -82,9 +82,12 @@ export const useProposal = (index: number) => {
   const id = `000${index}`.slice(-4);
 
   const proposalKeys = useQuery(
-    ['proposalKeys', network, governor.toString(), index],
+    ['proposalKeys', network, governor?.toString(), index],
     async () => {
-      const [proposalKey] = await findProposalAddress(governor, new u64(index));
+      const [proposalKey] = await findProposalAddress(
+        governor!,
+        new u64(index)
+      );
       const [proposalMetaKey] = await findProposalMetaAddress(proposalKey);
       return { proposalKey, proposalMetaKey };
     }
@@ -105,7 +108,7 @@ export const useProposal = (index: number) => {
   const isLoading =
     (queued && !txData) || !proposalData || proposalMetaData === undefined;
   const proposalInfoQuery = useQuery({
-    queryKey: ['proposalInfo', network, governor.toString(), index],
+    queryKey: ['proposalInfo', network, governor?.toString(), index],
     queryFn: (): ProposalInfo => {
       invariant(proposalData);
       return buildProposalInfo({
@@ -176,7 +179,7 @@ export const useProposals = () => {
           .fill(null)
           .map((_, i) => proposalCount - i - 1)
           .map(i => ({
-            queryKey: ['proposalKeys', network, governor.toString(), i],
+            queryKey: ['proposalKeys', network, governor?.toString(), i],
             queryFn: async () => {
               invariant(governorData);
               const [proposalKey] = await findProposalAddress(
@@ -231,7 +234,7 @@ export const useProposals = () => {
           .fill(null)
           .map((_, i) => proposalCount - i - 1)
           .map(i => ({
-            queryKey: ['proposalInfo', network, governor.toString(), i],
+            queryKey: ['proposalInfo', network, governor?.toString(), i],
             queryFn: (): ProposalInfo | null => {
               const proposalData = proposalsData.find(
                 p => p?.accountInfo.data.index.toNumber() === i
diff --git a/package.json b/package.json
index 85835c1b..5f44e3b7 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "@metaplex/js": "^4.12.0",
     "@nfteyez/sol-rayz": "^0.10.2",
     "@nfteyez/sol-rayz-react": "^0.10.2",
+    "@octokit/plugin-rest-endpoint-methods": "^5.13.0",
     "@project-serum/anchor": "^0.24.2",
     "@saberhq/anchor-contrib": "^1.13.1",
     "@saberhq/sail": "3.4.4",
diff --git a/yarn.lock b/yarn.lock
index fe9f42f3..8b9aa96a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -673,6 +673,26 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@octokit/openapi-types@^11.2.0":
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-11.2.0.tgz#b38d7fc3736d52a1e96b230c1ccd4a58a2f400a6"
+  integrity sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==
+
+"@octokit/plugin-rest-endpoint-methods@^5.13.0":
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz#8c46109021a3412233f6f50d28786f8e552427ba"
+  integrity sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==
+  dependencies:
+    "@octokit/types" "^6.34.0"
+    deprecation "^2.3.1"
+
+"@octokit/types@^6.34.0":
+  version "6.34.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.34.0.tgz#c6021333334d1ecfb5d370a8798162ddf1ae8218"
+  integrity sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==
+  dependencies:
+    "@octokit/openapi-types" "^11.2.0"
+
 "@project-serum/anchor@0.24.2", "@project-serum/anchor@^0.24.2":
   version "0.24.2"
   resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.24.2.tgz#a3c52a99605c80735f446ca9b3a4885034731004"
@@ -2559,6 +2579,11 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
+deprecation@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
+  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
+
 dequal@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d"

From 2c49d10306da76fac9f5e7f1b01731355145d102 Mon Sep 17 00:00:00 2001
From: SOL Berenson <solberenson@pm.me>
Date: Sat, 14 May 2022 00:30:01 +1000
Subject: [PATCH 008/101] feat(farm): add stake/unstake using `sendAll` (#112)

* feat(farm): add stake/unstake using `sendAll`

Add staking/unstaking using multiple transactions and
`Provider.sendAll()` when the number of NFTs is too large to send in a
single transaction.

* feat(farm): add `Select All` buttons

* feat(farm): batch deposit/withdraw instructions when using `sendAll`

* feat(farm): batch `sendAll`
---
 hooks/useGemFarm.tsx        | 163 +++++++++++++++++++++++++++++++++---
 pages/farm/[name]/index.tsx |  16 ++++
 2 files changed, 167 insertions(+), 12 deletions(-)

diff --git a/hooks/useGemFarm.tsx b/hooks/useGemFarm.tsx
index 84566586..0c39bc04 100644
--- a/hooks/useGemFarm.tsx
+++ b/hooks/useGemFarm.tsx
@@ -244,10 +244,13 @@ const useGemFarm = () => {
 
   // on nfts select and unselect fns
   const onWalletNFTSelect = (NFT: NFT) => {
-    if (selectedWalletNFTs.length >= 2) return;
     setSelectedWalletNFTs([...selectedWalletNFTs, NFT]);
   };
 
+  const onWalletNFTSelectAll = async () => {
+    setSelectedWalletNFTs(Object.values(walletNFTsInFarm));
+  };
+
   const onWalletNFTUnselect = (NFT: NFT) => {
     const newSelected = selectedWalletNFTs.filter(
       nft => !(nft.tokenId.toString() === NFT.tokenId.toString())
@@ -256,10 +259,13 @@ const useGemFarm = () => {
   };
 
   const onStakedNFTSelect = (NFT: NFT) => {
-    if (selectedVaultNFTs.length >= 3) return;
     setSelectedVaultNFTs([...selectedVaultNFTs, NFT]);
   };
 
+  const onStakedNFTSelectAll = async () => {
+    setSelectedVaultNFTs(Object.values(stakedNFTsInFarm));
+  };
+
   const onStakedNFTUnselect = (unselectedNFT: NFT) => {
     const newSelected = selectedVaultNFTs.filter(
       nft => !(nft.tokenId.toString() === unselectedNFT.tokenId.toString())
@@ -286,11 +292,30 @@ const useGemFarm = () => {
     }
   };
 
+  const MAX_SINGLE_TX_STAKE = 2;
+
   const handleStakeButtonClick = async () => {
+    setFeedbackStatus('Staking...');
+
+    if (selectedWalletNFTs.length <= MAX_SINGLE_TX_STAKE) {
+      await stakeSingleTx();
+    } else {
+      await stakeSendAll();
+    }
+
+    await fetchFarmerDetails(gf, gb);
+    await refreshNFTsWithLoadingIcon();
+
+    setFeedbackStatus('');
+
+    setSelectedWalletNFTs([]);
+    setSelectedVaultNFTs([]);
+  };
+
+  async function stakeSingleTx() {
     if (!gf || !gb) throw new Error('No Gem Bank client has been initialized.');
 
     const tx = new Transaction();
-    setFeedbackStatus('Staking...');
     if (vaultAcc?.locked) {
       // Unlock vault
       tx.add(await gf.unstakeWalletIx(new PublicKey(farmAddress!)));
@@ -325,21 +350,79 @@ const useGemFarm = () => {
 
     const txSig = await gf.provider.sendAndConfirm!(tx);
     await connection.confirmTransaction(txSig);
+  }
+
+  const MAX_DEPOSIT_IX_PER_BATCH = 3;
+  const MAX_IX_PER_SEND_ALL = 50;
+
+  async function stakeSendAll() {
+    if (!gf || !gb) throw new Error('No Gem Bank client has been initialized.');
+
+    await unlockVault();
+
+    for (let i = 0; i < selectedWalletNFTs.length; i += MAX_IX_PER_SEND_ALL) {
+      const txs: Transaction[] = [];
+      const sendAllBatch = selectedWalletNFTs.slice(i, i + MAX_IX_PER_SEND_ALL);
+
+      for (let j = 0; j < sendAllBatch.length; j += MAX_DEPOSIT_IX_PER_BATCH) {
+        const depositTx = new Transaction();
+        const batch = sendAllBatch.slice(j, j + MAX_DEPOSIT_IX_PER_BATCH);
+        const instructions = await Promise.all(
+          batch.map(async nft => {
+            const creator = new PublicKey(nft.creators[0].address || '');
+            const tokenAccResult = await tokenAccountResult(
+              gf,
+              gb,
+              wallet!.publicKey,
+              new PublicKey(nft.mint)
+            );
+
+            return await gb.depositGemWalletIx(
+              new PublicKey(bankAddress),
+              new PublicKey(farmerAcc.vault),
+              new BN(1),
+              new PublicKey(nft.mint),
+              new PublicKey(tokenAccResult[0]),
+              creator
+            );
+          })
+        );
+        instructions.forEach(ix => depositTx.add(ix));
+        txs.push(depositTx);
+      }
+      await gf.provider.sendAll!(
+        txs.map(tx => {
+          return { tx, signers: [] };
+        })
+      );
+    }
+
+    await lockVault();
+  }
+
+  const MAX_SINGLE_TX_UNSTAKE = 3;
 
+  const handleUnstakeButtonClick = async () => {
+    setFeedbackStatus('Unstaking wallet...');
+
+    if (selectedVaultNFTs.length <= MAX_SINGLE_TX_UNSTAKE) {
+      await unstakeSingleTx();
+    } else {
+      await unstakeSendAll();
+    }
     await fetchFarmerDetails(gf, gb);
     await refreshNFTsWithLoadingIcon();
 
     setFeedbackStatus('');
 
-    setSelectedWalletNFTs([]);
     setSelectedVaultNFTs([]);
+    setSelectedWalletNFTs([]);
   };
 
-  const handleUnstakeButtonClick = async () => {
+  async function unstakeSingleTx() {
     if (!gf || !gb) throw new Error('No Gem Bank client has been initialized.');
 
     const tx = new Transaction();
-    setFeedbackStatus('Unstaking wallet...');
     // Unlock vault
     tx.add(await gf.unstakeWalletIx(new PublicKey(farmAddress!)));
     // End cooldown
@@ -362,16 +445,70 @@ const useGemFarm = () => {
       tx.add(await gf.stakeWalletIx(new PublicKey(farmAddress!)));
     }
 
-  const txSig = await gf.provider.sendAndConfirm!(tx);
+    const txSig = await gf.provider.sendAndConfirm!(tx);
     await connection.confirmTransaction(txSig);
+  }
 
-    await fetchFarmerDetails(gf, gb);
-    await refreshNFTsWithLoadingIcon();
+  const MAX_WITHDRAW_IX_PER_BATCH = 4;
 
-    setFeedbackStatus('');
+  async function unstakeSendAll() {
+    if (!gf || !gb) throw new Error('No Gem Bank client has been initialized.');
 
-    setSelectedVaultNFTs([]);
-    setSelectedWalletNFTs([]);
+    await unlockVault();
+
+    for (let i = 0; i < selectedVaultNFTs.length; i += MAX_IX_PER_SEND_ALL) {
+      const txs: Transaction[] = [];
+      const sendAllBatch = selectedVaultNFTs.slice(i, i + MAX_IX_PER_SEND_ALL);
+
+      for (let j = 0; j < sendAllBatch.length; j += MAX_WITHDRAW_IX_PER_BATCH) {
+        const withdrawTx = new Transaction();
+        const batch = sendAllBatch.slice(j, j + MAX_WITHDRAW_IX_PER_BATCH);
+        const instructions = await Promise.all(
+          batch.map(
+            async nft =>
+              await gb.withdrawGemWalletIx(
+                new PublicKey(bankAddress),
+                new PublicKey(farmerAcc.vault),
+                new BN(1),
+                new PublicKey(nft.mint)
+              )
+          )
+        );
+        instructions.forEach(ix => withdrawTx.add(ix));
+        txs.push(withdrawTx);
+      }
+      await gf.provider.sendAll!(
+        txs.map(tx => {
+          return { tx, signers: [] };
+        })
+      );
+    }
+
+    if (selectedVaultNFTs.length < farmerAcc.gemsStaked.toNumber()) {
+      // Re-stake remaining
+      await lockVault();
+    }
+  }
+
+  const lockVault = async () => {
+    if (!vaultAcc?.locked) {
+      const tx = new Transaction();
+      tx.add(await gf!.stakeWalletIx(new PublicKey(farmAddress!)));
+      await gf!.provider.sendAndConfirm!(tx);
+    }
+  };
+
+  const unlockVault = async () => {
+    if (vaultAcc?.locked) {
+      setFeedbackStatus('Unlocking vault...');
+
+      const tx = new Transaction();
+      // Unlock vault
+      tx.add(await gf!.unstakeWalletIx(new PublicKey(farmAddress!)));
+      // End cooldown
+      tx.add(await gf!.unstakeWalletIx(new PublicKey(farmAddress!)));
+      await gf!.provider.sendAndConfirm!(tx);
+    }
   };
 
   console.log({ availableA });
@@ -435,8 +572,10 @@ const useGemFarm = () => {
     initializeFarmerAcc,
     refreshNFTsWithLoadingIcon,
     onWalletNFTSelect,
+    onWalletNFTSelectAll,
     onWalletNFTUnselect,
     onStakedNFTSelect,
+    onStakedNFTSelectAll,
     onStakedNFTUnselect,
     handleRefreshRewardsButtonClick,
     handleStakeButtonClick,
diff --git a/pages/farm/[name]/index.tsx b/pages/farm/[name]/index.tsx
index bb844b66..2ad462a2 100644
--- a/pages/farm/[name]/index.tsx
+++ b/pages/farm/[name]/index.tsx
@@ -11,8 +11,10 @@ import { useState } from 'react';
 const Nft: NextPage = () => {
   const {
     onWalletNFTSelect,
+    onWalletNFTSelectAll,
     onWalletNFTUnselect,
     onStakedNFTSelect,
+    onStakedNFTSelectAll,
     onStakedNFTUnselect,
     initializeFarmerAcc,
     handleStakeButtonClick,
@@ -75,6 +77,15 @@ const Nft: NextPage = () => {
           isFetching={isFetching}
           title="Select your NFTs"
           buttons={[
+            {
+              title: `Select All`,
+              disabled: !farmerAcc
+                ? false
+                : Object.values(walletNFTsInFarm).length > 0
+                ? false
+                : true,
+              onClick: () => onWalletNFTSelectAll()
+            },
             {
               title: !farmerAcc
                 ? 'Initialize'
@@ -100,6 +111,11 @@ const Nft: NextPage = () => {
           isFetching={isFetching}
           title="Your vault"
           buttons={[
+            {
+              title: `Select All`,
+              disabled: Object.values(stakedNFTsInFarm).length < 1,
+              onClick: () => onStakedNFTSelectAll()
+            },
             {
               title: `Unstake (${selectedVaultNFTs.length})`,
               disabled: !selectedVaultNFTs.length,

From ebbef8aaacc7f9d29f7c72ebbbd87d479b814eba Mon Sep 17 00:00:00 2001
From: SOL Berenson <solberenson@pm.me>
Date: Sat, 14 May 2022 00:40:43 +1000
Subject: [PATCH 009/101] feat: increase transaction timeout to 120s (#131)

increased transaction timeout to 120s in network config to combat low tps on Solana
---
 next.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/next.config.js b/next.config.js
index 88418417..017b9695 100644
--- a/next.config.js
+++ b/next.config.js
@@ -60,6 +60,7 @@ module.exports = (phase, {defaultConfig}) => {
         'mainnet-beta': {
           name: 'mainnet-beta',
           endpoint: mainNetEndpoint,
+          confirmTransactionInitialTimeout: 120000,
         }
       },
       async headers() {

From e952cd8b8ee4371708844e131e717d03714720fb Mon Sep 17 00:00:00 2001
From: BowTiedHeron <93859808+BowTiedHeron@users.noreply.github.com>
Date: Sat, 14 May 2022 13:19:27 +0200
Subject: [PATCH 010/101] update timeout to 180s (testing)

---
 next.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/next.config.js b/next.config.js
index 017b9695..b5540abe 100644
--- a/next.config.js
+++ b/next.config.js
@@ -60,7 +60,7 @@ module.exports = (phase, {defaultConfig}) => {
         'mainnet-beta': {
           name: 'mainnet-beta',
           endpoint: mainNetEndpoint,
-          confirmTransactionInitialTimeout: 120000,
+          confirmTransactionInitialTimeout: 180000,
         }
       },
       async headers() {

From bf438b02ada43f963fc7ec324f531ac894b74524 Mon Sep 17 00:00:00 2001
From: SOL Berenson <solberenson@pm.me>
Date: Sun, 15 May 2022 21:58:38 +1000
Subject: [PATCH 011/101] feat(farm): add stake vault button (#132)

This provides a fallback mechanism for when a farmer deposits NFTs to
their vault but the stake transaction is not sent/confirmed.
In this case, this allows the farmer to stake their vault manually.
---
 .../FarmHeaderComponent.tsx                   | 27 +++++++++++++++++--
 hooks/useGemFarm.tsx                          |  2 ++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/components/FarmHeaderComponent/FarmHeaderComponent.tsx b/components/FarmHeaderComponent/FarmHeaderComponent.tsx
index dee8432a..ab796016 100644
--- a/components/FarmHeaderComponent/FarmHeaderComponent.tsx
+++ b/components/FarmHeaderComponent/FarmHeaderComponent.tsx
@@ -10,7 +10,11 @@ const FarmHeaderComponent = () => {
     collectionTotalNumber,
     rewardTokenName,
     handleRefreshRewardsButtonClick,
-    claimRewards
+    claimRewards,
+    farmerState,
+    stakedNFTsInFarm,
+    farmerVaultLocked,
+    lockVault
   } = useGemFarm();
 
   const [txLoading, setTxLoading] = useState({
@@ -105,6 +109,14 @@ const FarmHeaderComponent = () => {
               {farmerCount}
             </Text>
           </Stack>
+          <Stack direction="vertical" space="1" align="center">
+            <Text size="small" align="center" variant="label">
+              Your vault
+            </Text>
+            <Text size="small" variant="small">
+              {farmerState}
+            </Text>
+          </Stack>
           {Boolean(unstakingFee) && (
             <Stack direction="vertical" space="1" align="center">
               <Text align="center" variant="label">
@@ -118,7 +130,6 @@ const FarmHeaderComponent = () => {
         </Stack>
         <Stack space="3" justify="center" direction="horizontal">
           <Button
-            
             onClick={handleRefreshRewardsButtonClick}
             variant="secondary"
             shape="square"
@@ -134,6 +145,18 @@ const FarmHeaderComponent = () => {
           >
             {`Claim $${rewardTokenName}`}
           </Button>
+          {(Object.values(stakedNFTsInFarm).length > 0 &&
+            !farmerVaultLocked) && (
+            <Button
+              onClick={() => withTxLoading(lockVault, 'stake')}
+              loading={txLoading.value && txLoading.txName === 'stake'}
+              size="small"
+              tone="green"
+              variant="primary"
+            >
+              {`Stake Vault`}
+            </Button>
+          )}
         </Stack>
       </Stack>
     </Box>
diff --git a/hooks/useGemFarm.tsx b/hooks/useGemFarm.tsx
index 0c39bc04..e73034b6 100644
--- a/hooks/useGemFarm.tsx
+++ b/hooks/useGemFarm.tsx
@@ -495,6 +495,7 @@ const useGemFarm = () => {
       const tx = new Transaction();
       tx.add(await gf!.stakeWalletIx(new PublicKey(farmAddress!)));
       await gf!.provider.sendAndConfirm!(tx);
+      await fetchFarmerDetails(gf, gb);
     }
   };
 
@@ -569,6 +570,7 @@ const useGemFarm = () => {
 
   return {
     claimRewards,
+    lockVault,
     initializeFarmerAcc,
     refreshNFTsWithLoadingIcon,
     onWalletNFTSelect,

From 6bbb8d762377c51912e16a4dddad1a69971c542d Mon Sep 17 00:00:00 2001
From: BowTiedHeron <93859808+BowTiedHeron@users.noreply.github.com>
Date: Sat, 30 Apr 2022 14:35:28 +0200
Subject: [PATCH 012/101] fix(farms): Upgraded farms to new gem farm version
 and added a staked in filter (#109)

fix(farm): gem-farm-ts 0.24.1 version bump
feat(farm): added staked in filter for farms
---
 .../FarmHeaderComponent.tsx                   | 19 +++++++++++--------
 hooks/useGemFarm.tsx                          |  3 +--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/components/FarmHeaderComponent/FarmHeaderComponent.tsx b/components/FarmHeaderComponent/FarmHeaderComponent.tsx
index ab796016..5ae56f2d 100644
--- a/components/FarmHeaderComponent/FarmHeaderComponent.tsx
+++ b/components/FarmHeaderComponent/FarmHeaderComponent.tsx
@@ -3,18 +3,22 @@ import React, { useMemo, useState } from 'react';
 import { LAMPORTS_PER_SOL } from '@solana/web3.js';
 import useGemFarm from 'hooks/useGemFarm';
 
-const FarmHeaderComponent = () => {
+interface FarmHeaderComponentProps {
+  farmerState: string;
+  stakedNFTsInFarm: { [tokenId: string]: NFT };
+  farmerVaultLocked: boolean;
+  lockVault: () => Promise<void>;
+}
+
+const FarmHeaderComponent = (props: FarmHeaderComponentProps) => {
+  const { farmerState, stakedNFTsInFarm, farmerVaultLocked, lockVault } = props;
   const {
     farmerAcc,
     farmAcc,
     collectionTotalNumber,
     rewardTokenName,
     handleRefreshRewardsButtonClick,
-    claimRewards,
-    farmerState,
-    stakedNFTsInFarm,
-    farmerVaultLocked,
-    lockVault
+    claimRewards
   } = useGemFarm();
 
   const [txLoading, setTxLoading] = useState({
@@ -145,8 +149,7 @@ const FarmHeaderComponent = () => {
           >
             {`Claim $${rewardTokenName}`}
           </Button>
-          {(Object.values(stakedNFTsInFarm).length > 0 &&
-            !farmerVaultLocked) && (
+          {Object.values(stakedNFTsInFarm).length > 0 && !farmerVaultLocked && (
             <Button
               onClick={() => withTxLoading(lockVault, 'stake')}
               loading={txLoading.value && txLoading.txName === 'stake'}
diff --git a/hooks/useGemFarm.tsx b/hooks/useGemFarm.tsx
index e73034b6..8a947642 100644
--- a/hooks/useGemFarm.tsx
+++ b/hooks/useGemFarm.tsx
@@ -65,7 +65,7 @@ const useGemFarm = () => {
   const [selectedWalletNFTs, setSelectedWalletNFTs] = useState<NFT[]>([]);
   const [selectedVaultNFTs, setSelectedVaultNFTs] = useState<NFT[]>([]);
 
-  console.log(wallet?.connected)
+  console.log(wallet?.connected);
 
   // Get farm and bank addresses from router
   const router = useRouter();
@@ -215,7 +215,6 @@ const useGemFarm = () => {
     }
   }, [isStartingGemFarm, setNFTs]);
 
-
   const onRefreshNFTs = async () => {
     if (!gb) return;
     const results = await Promise.all([

From ceeb44be6ab317ce7f25944be55d0145c28ddf16 Mon Sep 17 00:00:00 2001
From: HoneyDeFi <honeydeficontact@gmail.com>
Date: Fri, 13 May 2022 22:46:08 +0200
Subject: [PATCH 013/101] KK farm init

---
 constants/new-farms.tsx | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/constants/new-farms.tsx b/constants/new-farms.tsx
index e2eb2e93..2a376995 100644
--- a/constants/new-farms.tsx
+++ b/constants/new-farms.tsx
@@ -166,4 +166,19 @@ export const newFarmCollections: TGFarm[] = [
     farmAddress: "EiqwoUUgDxpUK481wadNaQVR6Rr1W6365rshRPwr5tiW",
     bankAddress: "GWmC7H7xBL93eWgiiVcCZU5eBprzKzTCyfbG7f3st56f",
   },
+  {
+    id: "KZKL", // manager Kozym71mL4rhfzUn9N7cTvrmuurqV45UEfBGYem41UK
+    imageUrl: "https://dl.airtable.com/.attachments/4449a2f4ad8db444325ef09ae8335dcb/a963280e/500.jpg",
+    name: "Kozy Koalas",
+    totalStaked: "???",
+    totalNumber:3333, 
+    allocation: "-",
+    totalStakedByUser: "-",
+    eventStartDate: "2022-03-04T14:50Z",
+    eventDuration: "∞",
+    updateAuthority: "J2zmST5Gkgpm4H6AWj6DCnA8ubiBRs6yftCe3MkVXem5",
+    rewardTokenName: "KOZY",
+    farmAddress: "6ktAbBBPHVyfMMpxhBoDraKMsjbXiJeWshGKXP76VJZQ",
+    bankAddress: "7zeVRxx3jJWRmbxgy8Ap86Wwbw6JvdjBqFXaojoJXo5y",
+  },
 ];
\ No newline at end of file

From 894a8680d86ab37d930f3cd65df8e4dba854eb71 Mon Sep 17 00:00:00 2001
From: HoneyDeFi <honeydeficontact@gmail.com>
Date: Fri, 13 May 2022 22:52:22 +0200
Subject: [PATCH 014/101] new line eof new-farm.tsx

---
 constants/new-farms.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants/new-farms.tsx b/constants/new-farms.tsx
index 2a376995..378fee7e 100644
--- a/constants/new-farms.tsx
+++ b/constants/new-farms.tsx
@@ -181,4 +181,4 @@ export const newFarmCollections: TGFarm[] = [
     farmAddress: "6ktAbBBPHVyfMMpxhBoDraKMsjbXiJeWshGKXP76VJZQ",
     bankAddress: "7zeVRxx3jJWRmbxgy8Ap86Wwbw6JvdjBqFXaojoJXo5y",
   },
-];
\ No newline at end of file
+];

From a2e756509d566fdd064c241232fa63df96e9622a Mon Sep 17 00:00:00 2001
From: SOL Berenson <solberenson@pm.me>
Date: Mon, 16 May 2022 19:00:12 +1000
Subject: [PATCH 015/101] fix(farm): update "Your Vault" state on stake/unstake
 (#133)

Pass `farmerState` to `FarmHeaderComponent` via props to ensure
re-render when `farmersState` is updated by parent.
---
 pages/farm/[name]/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/farm/[name]/index.tsx b/pages/farm/[name]/index.tsx
index 2ad462a2..d5e0e6da 100644
--- a/pages/farm/[name]/index.tsx
+++ b/pages/farm/[name]/index.tsx
@@ -24,7 +24,8 @@ const Nft: NextPage = () => {
     walletNFTsInFarm,
     farmerAcc,
     selectedVaultNFTs,
-    selectedWalletNFTs
+    selectedWalletNFTs,
+    farmerState
   } = useGemFarm();
 
   const [txLoading, setTxLoading] = useState({
@@ -68,7 +69,7 @@ const Nft: NextPage = () => {
               </Button>
             </Link>
           </Box>
-          <FarmHeaderComponent />
+          <FarmHeaderComponent farmerState={farmerState} />
         </Stack>
       </Box>
       <Box display="flex" height="full" className={styles.cardsContainer}>

From 4437894ec6a9a790fc64f792159133e5dc60686d Mon Sep 17 00:00:00 2001
From: BowTiedHeron <93859808+BowTiedHeron@users.noreply.github.com>
Date: Mon, 16 May 2022 11:03:52 +0200
Subject: [PATCH 016/101] update timeout to 5min (testing)

---
 next.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/next.config.js b/next.config.js
index b5540abe..4fbbffe6 100644
--- a/next.config.js
+++ b/next.config.js
@@ -60,7 +60,7 @@ module.exports = (phase, {defaultConfig}) => {
         'mainnet-beta': {
           name: 'mainnet-beta',
           endpoint: mainNetEndpoint,
-          confirmTransactionInitialTimeout: 180000,
+          confirmTransactionInitialTimeout: 300000,
         }
       },
       async headers() {

From 8cca0240d11cc58d67d65eaa2c39730f73811a6b Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo@brainrex.com>
Date: Mon, 16 May 2022 16:56:18 +0200
Subject: [PATCH 017/101] feat: add google analytics 4

---
 .env.example   |  6 +++++-
 pages/_app.tsx | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 2a54c320..8dbca527 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,7 @@
 NEXT_PUBLIC_RPC_NODE = 'https://api.mainnet-beta.solana.com'
+NEXT_PUBLIC_GA=
+NEXT_PUBLIC_STAKE_POOL_ADDR=
+NEXT_PUBLIC_VOTE_PROGRAM_ID=
 NEXT_PUBLIC_GOVERNOR_ADDRESS=
-NEXT_PUBLIC_SMART_WALLET_ADDRESS=
\ No newline at end of file
+NEXT_PUBLIC_SMART_WALLET_ADDRESS=
+NEXT_PUBLIC_LOCKER_ADDR=
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 61d78f5e..d60b3db9 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -16,6 +16,7 @@ import 'degen/styles';
 import '../styles/globals.css';
 import 'react-toastify/dist/ReactToastify.css';
 import { GovernorProvider } from 'hooks/tribeca/useGovernor';
+import Script from 'next/script';
 
 const queryClient = new QueryClient();
 const network = process.env.NETWORK as Network;
@@ -50,6 +51,21 @@ function MyApp({ Component, pageProps }: AppProps) {
       defaultMode="dark"
       defaultAccent={storedAccent || defaultAccent}
     >
+      <Script
+        strategy="lazyOnload"
+        src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GA}`}
+      />
+
+      <Script id="gtm-script" strategy="lazyOnload">
+        {`
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', '${process.env.NEXT_PUBLIC_GA}');
+
+       `}
+      </Script>
       <QueryClientProvider client={queryClient}>
         <ReactQueryDevtools initialIsOpen={false} />
         <WalletKitProvider

From 4fa94811c15bccd599419d68bbe193abbc26bb59 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Mon, 16 May 2022 17:02:00 +0200
Subject: [PATCH 018/101] feat: add google analytics 4 (#139)

The following changes have been made:

Modified pages/_app.ts to use the built-in NextJS <Script> tag, in order to add GA4 global site tag.
---
 pages/_app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/_app.tsx b/pages/_app.tsx
index d60b3db9..72f28793 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -11,12 +11,12 @@ import { ToastContainer } from 'react-toastify';
 import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
 import SecPopup from 'components/SecPopup';
 import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
+import Script from 'next/script';
 
 import 'degen/styles';
 import '../styles/globals.css';
 import 'react-toastify/dist/ReactToastify.css';
 import { GovernorProvider } from 'hooks/tribeca/useGovernor';
-import Script from 'next/script';
 
 const queryClient = new QueryClient();
 const network = process.env.NETWORK as Network;

From 24812e3aeb664f63d702dbe2937dbfb018f7bc05 Mon Sep 17 00:00:00 2001
From: SOL Berenson <solberenson@pm.me>
Date: Tue, 17 May 2022 02:02:35 +1000
Subject: [PATCH 019/101] fix(farm): update "Stake Vault" visibility on stake
 (#135)

Pass necessary state to `FarmHeaderComponent` via props to ensure
re-render when farm state is changed by parent.
---
 pages/farm/[name]/index.tsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pages/farm/[name]/index.tsx b/pages/farm/[name]/index.tsx
index d5e0e6da..c148f994 100644
--- a/pages/farm/[name]/index.tsx
+++ b/pages/farm/[name]/index.tsx
@@ -25,7 +25,9 @@ const Nft: NextPage = () => {
     farmerAcc,
     selectedVaultNFTs,
     selectedWalletNFTs,
-    farmerState
+    farmerState,
+    farmerVaultLocked,
+    lockVault
   } = useGemFarm();
 
   const [txLoading, setTxLoading] = useState({
@@ -69,7 +71,12 @@ const Nft: NextPage = () => {
               </Button>
             </Link>
           </Box>
-          <FarmHeaderComponent farmerState={farmerState} />
+          <FarmHeaderComponent
+            farmerState={farmerState}
+            stakedNFTsInFarm={stakedNFTsInFarm}
+            farmerVaultLocked={farmerVaultLocked}
+            lockVault={lockVault}
+          />
         </Stack>
       </Box>
       <Box display="flex" height="full" className={styles.cardsContainer}>

From d5c031a69d7c08e85e7f68aa3375a333f79059fd Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Wed, 11 May 2022 07:46:34 -0500
Subject: [PATCH 020/101] Initial commit for governance

---
 components/HelperCard.tsx | 32 ++++++++++++++++++++++++++++++++
 pages/_app.tsx            |  6 ++++++
 2 files changed, 38 insertions(+)
 create mode 100644 components/HelperCard.tsx

diff --git a/components/HelperCard.tsx b/components/HelperCard.tsx
new file mode 100644
index 00000000..cb2d1c17
--- /dev/null
+++ b/components/HelperCard.tsx
@@ -0,0 +1,32 @@
+import { Box } from 'degen';
+
+interface Props {
+  children?: React.ReactNode;
+  className?: string;
+  variant?: 'primary' | 'muted' | 'error' | 'warn';
+}
+
+export const HelperCard: React.FC<Props> = ({
+  children,
+  variant = 'primary',
+  className
+}: Props) => {
+  let border = 'border';
+  switch (variant) {
+    case 'primary':
+    case 'muted':
+    case 'error':
+    case 'warn':
+  }
+  return (
+    <Box
+      paddingX="4"
+      paddingY="2"
+      borderWidth="1"
+      fontSize="small"
+      className={className}
+    >
+      {children}
+    </Box>
+  );
+};
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 72f28793..ed470e5d 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -12,6 +12,12 @@ import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
 import SecPopup from 'components/SecPopup';
 import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
 import Script from 'next/script';
+import { GOVERNOR_ADDRESS, SDKProvider } from 'helpers/sdk';
+
+import 'degen/styles';
+import '../styles/globals.css';
+import 'react-toastify/dist/ReactToastify.css';
+import { GovernorProvider } from 'hooks/tribeca/useGovernor';
 
 import 'degen/styles';
 import '../styles/globals.css';

From 1d1db1fdcf6a4dc3ad737648ff6f79a9c92a10b1 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 17 May 2022 04:33:22 -0500
Subject: [PATCH 021/101] Upgrade locker program

---
 pages/_app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/_app.tsx b/pages/_app.tsx
index ed470e5d..e16aad91 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -12,7 +12,7 @@ import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
 import SecPopup from 'components/SecPopup';
 import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
 import Script from 'next/script';
-import { GOVERNOR_ADDRESS, SDKProvider } from 'helpers/sdk';
+import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
 
 import 'degen/styles';
 import '../styles/globals.css';

From a3a8f9d75bbf71874caf87a3377dfa2548bce893 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 17 May 2022 08:53:51 -0500
Subject: [PATCH 022/101] Fix conflict

---
 pages/_app.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pages/_app.tsx b/pages/_app.tsx
index e16aad91..fa8e7f9f 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,3 +1,4 @@
+import Script from 'next/script';
 import { useEffect, useState } from 'react';
 import { WalletKitProvider } from '@gokiprotocol/walletkit';
 import { Network } from '@saberhq/solana-contrib';
@@ -11,18 +12,11 @@ import { ToastContainer } from 'react-toastify';
 import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
 import SecPopup from 'components/SecPopup';
 import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
-import Script from 'next/script';
-import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
-
-import 'degen/styles';
-import '../styles/globals.css';
-import 'react-toastify/dist/ReactToastify.css';
 import { GovernorProvider } from 'hooks/tribeca/useGovernor';
 
 import 'degen/styles';
 import '../styles/globals.css';
 import 'react-toastify/dist/ReactToastify.css';
-import { GovernorProvider } from 'hooks/tribeca/useGovernor';
 
 const queryClient = new QueryClient();
 const network = process.env.NETWORK as Network;

From 204a6c05d857fc25a02fc3d3e4c74bce2ea3645f Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 17 May 2022 08:58:28 -0500
Subject: [PATCH 023/101] Replace proposal prefix

---
 hooks/tribeca/useGovernor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hooks/tribeca/useGovernor.ts b/hooks/tribeca/useGovernor.ts
index ae6538ad..304e13ef 100644
--- a/hooks/tribeca/useGovernor.ts
+++ b/hooks/tribeca/useGovernor.ts
@@ -156,7 +156,7 @@ const useGovernorInner = (props: GovernorProps | undefined) => {
         'To create a proposal, first make a post on the [GGA Discord](https://discord.gg/k3UtYYzcvu).\nOnce you have determined that there is sufficient community support,\nadd the link to the discussion thread and create a proposal.\n',
       discussion: {
         required: true,
-        prefix: 've'
+        prefix: 'https://forum.honey.finance/t'
       }
     }
   };

From 8de1547c64c4a4e5f5b07663fe01ebb9800acbaa Mon Sep 17 00:00:00 2001
From: BowTiedHeron <93859808+BowTiedHeron@users.noreply.github.com>
Date: Tue, 17 May 2022 17:27:54 +0200
Subject: [PATCH 024/101] test vercel

---
 pages/_app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/_app.tsx b/pages/_app.tsx
index fa8e7f9f..41c71cf8 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -101,4 +101,4 @@ function MyApp({ Component, pageProps }: AppProps) {
   );
 }
 
-export default MyApp;
+export default MyApp; 

From 12b804638b529fede293a995c31d9d089ce7f625 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Wed, 18 May 2022 18:05:06 -0500
Subject: [PATCH 025/101] Update tribeca sdk

---
 .../ProposalConfirmationModal/index.tsx       |    4 +-
 .../locked-voter/ProposalCreateInner.tsx      |   28 +-
 .../CastVoteButton/CastVoteModal.tsx          |    9 +-
 .../CastVoteButton/VoteResult.tsx             |    9 +-
 .../CastVoteButton/VoteSelectContents.tsx     |  114 +-
 .../locked-voter/CastVoteButton/index.tsx     |    5 +-
 .../locked-voter/ProposalHistory.tsx          |    4 +-
 .../locked-voter/VotesCard.tsx                |    4 +-
 .../locked-voter/actions/ProposalActivate.tsx |   11 +-
 .../locked-voter/actions/ProposalVote.tsx     |    4 +-
 .../ProposalIndexView/locked-voter/index.tsx  |    2 +-
 .../ProposalsList/PlaceholderCard.tsx         |    2 +-
 .../Proposals/ProposalsList/ProposalCard.tsx  |   13 +-
 .../ProposalsList/ProposalStateBadge.tsx      |    2 +-
 .../ProposalsList/ProposalStateDate.tsx       |    4 +-
 .../ProposalsList/ProposalStateLabel.tsx      |    6 +-
 components/Proposals/ProposalsList/index.tsx  |    2 +-
 components/common/governance/Meter.tsx        |    4 +-
 helpers/dao/constants.ts                      |   92 +
 helpers/dao/index.ts                          |    4 +
 helpers/dao/programs/govern.ts                |   39 +
 helpers/dao/programs/index.ts                 |    2 +
 helpers/dao/programs/lockedVoter.ts           |   22 +
 helpers/dao/sdk.ts                            |  101 +
 helpers/dao/wrappers/govern/govern.ts         |   71 +
 helpers/dao/wrappers/govern/governor.ts       |  280 +++
 helpers/dao/wrappers/govern/index.ts          |    6 +
 helpers/dao/wrappers/govern/pda.ts            |   68 +
 helpers/dao/wrappers/govern/proposal.ts       |   35 +
 helpers/dao/wrappers/govern/setup.ts          |   95 +
 helpers/dao/wrappers/govern/types.ts          |   97 +
 helpers/dao/wrappers/index.ts                 |    2 +
 helpers/dao/wrappers/lockedVoter/escrow.ts    |  231 +++
 helpers/dao/wrappers/lockedVoter/index.ts     |    4 +
 helpers/dao/wrappers/lockedVoter/locker.ts    |  452 +++++
 helpers/dao/wrappers/lockedVoter/pda.ts       |   43 +
 helpers/dao/wrappers/lockedVoter/setup.ts     |   89 +
 helpers/idl/stake.json                        |   75 +
 helpers/parser.ts                             |    3 +-
 helpers/sdk/constant.ts                       |   28 +-
 helpers/sdk/gov.ts                            |    4 +-
 helpers/sdk/index.ts                          |    1 +
 helpers/sdk/pda.ts                            |   42 +
 helpers/sdk/stake.ts                          |    4 +-
 helpers/sdk/vehoney.ts                        |    2 +-
 helpers/types/govern.ts                       | 1719 +++++++++++++++++
 helpers/types/stake.ts                        |  150 ++
 helpers/utils.ts                              |    2 +-
 hooks/tribeca/useEscrow.ts                    |   12 +-
 hooks/tribeca/useGovernor.ts                  |    4 +-
 hooks/tribeca/useProposals.ts                 |    4 +-
 hooks/tribeca/useVote.ts                      |    2 +-
 hooks/useParsedInstruction.ts                 |    2 +-
 icons/PulsingDot.tsx                          |    6 +-
 package.json                                  |    8 +-
 pages/_app.tsx                                |    8 +-
 yarn.lock                                     |   37 +-
 57 files changed, 3879 insertions(+), 194 deletions(-)
 create mode 100644 helpers/dao/constants.ts
 create mode 100644 helpers/dao/index.ts
 create mode 100644 helpers/dao/programs/govern.ts
 create mode 100644 helpers/dao/programs/index.ts
 create mode 100644 helpers/dao/programs/lockedVoter.ts
 create mode 100644 helpers/dao/sdk.ts
 create mode 100644 helpers/dao/wrappers/govern/govern.ts
 create mode 100644 helpers/dao/wrappers/govern/governor.ts
 create mode 100644 helpers/dao/wrappers/govern/index.ts
 create mode 100644 helpers/dao/wrappers/govern/pda.ts
 create mode 100644 helpers/dao/wrappers/govern/proposal.ts
 create mode 100644 helpers/dao/wrappers/govern/setup.ts
 create mode 100644 helpers/dao/wrappers/govern/types.ts
 create mode 100644 helpers/dao/wrappers/index.ts
 create mode 100644 helpers/dao/wrappers/lockedVoter/escrow.ts
 create mode 100644 helpers/dao/wrappers/lockedVoter/index.ts
 create mode 100644 helpers/dao/wrappers/lockedVoter/locker.ts
 create mode 100644 helpers/dao/wrappers/lockedVoter/pda.ts
 create mode 100644 helpers/dao/wrappers/lockedVoter/setup.ts
 create mode 100644 helpers/sdk/pda.ts
 create mode 100644 helpers/types/govern.ts

diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
index a26d128c..9ec552e0 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
@@ -2,7 +2,7 @@ import { useSail } from '@saberhq/sail';
 import { buildStubbedTransaction } from '@saberhq/solana-contrib';
 import { useSolana } from '@saberhq/use-solana';
 import type { TransactionInstruction } from '@solana/web3.js';
-import { GovernorWrapper } from '@tribecahq/tribeca-sdk';
+import { GovernorWrapper } from 'helpers/dao';
 import ReactMarkdown from 'react-markdown';
 import invariant from 'tiny-invariant';
 import { useRouter } from 'next/router';
@@ -59,7 +59,7 @@ export const ProposalConfirmModal: React.FC<Props> = ({
     //     -4
     //   )} created`
     // });
-    router.push(`proposals/${createProposal.index.toString()}`);
+    router.push(`${createProposal.index.toString()}`);
     modalProps.onDismiss();
   };
 
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
index dad142a5..76b3e742 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -115,21 +115,23 @@ export const ProposalCreateInner: React.FC = () => {
               {/* </HelperCard> */}
               {proposalCfg?.notice && (
                 <HelperCard variant="primary">
-                  <div
-                  // css={css`
-                  //   p {
-                  //     ${tw`mb-2`}
-                  //   }
-                  //   a {
-                  //     ${tw`text-white`}
-                  //     &:hover {
-                  //       ${tw`underline`}
-                  //     }
-                  //   }
-                  // `}
+                  <Box
+                    color="white"
+                    fontWeight="bold"
+                    // css={css`
+                    //   p {
+                    //     ${tw`mb-2`}
+                    //   }
+                    //   a {
+                    //     ${tw`text-white`}
+                    //     &:hover {
+                    //       ${tw`underline`}
+                    //     }
+                    //   }
+                    // `}
                   >
                     <ReactMarkdown>{proposalCfg.notice}</ReactMarkdown>
-                  </div>
+                  </Box>
                 </HelperCard>
               )}
               {/* <label tw="flex flex-col gap-1" htmlFor="title">
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
index b276a848..926cfbf5 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
@@ -1,6 +1,6 @@
 import { useSail } from '@saberhq/sail';
 import { createMemoInstruction } from '@saberhq/solana-contrib';
-import type { VoteSide } from '@tribecahq/tribeca-sdk';
+import type { VoteSide } from 'helpers/dao';
 import { useState } from 'react';
 import invariant from 'tiny-invariant';
 
@@ -12,6 +12,7 @@ import { ModalInner } from 'components/Modal/ModalInner';
 import { VOTE_SIDE_LABEL } from '../VotesCard';
 import { VoteResult } from './VoteResult';
 import { VoteSelectContents } from './VoteSelectContents';
+import { Text } from 'degen';
 
 interface Props {
   proposalInfo: ProposalInfo;
@@ -58,7 +59,11 @@ export const CastVoteModal: React.FC<Props> = ({ proposalInfo }: Props) => {
 
   return (
     <ModalInner
-      title="Cast Vote"
+      title={
+        <Text variant="large" ellipsis>
+          Cast Vote
+        </Text>
+      }
       // tw="px-6 max-w-md"
       buttonProps={{
         disabled: !(side && escrow),
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx
index 574ddcc5..9195c959 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx
@@ -1,4 +1,4 @@
-import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { VoteSide } from 'helpers/dao';
 
 import { useGovernor } from 'hooks/tribeca/useGovernor';
 import type { ProposalInfo } from 'hooks/tribeca/useProposals';
@@ -47,7 +47,11 @@ export const VoteResult: React.FC<Props> = ({
 }: Props) => {
   return (
     <ModalInner
-      title="Vote Confirmed"
+      title={
+        <Text variant="large" ellipsis>
+          Vote Confirmed
+        </Text>
+      }
       // tw="px-6 max-w-md"
     >
       <Stack align="center">
@@ -57,6 +61,7 @@ export const VoteResult: React.FC<Props> = ({
           alignItems="center"
           maxWidth="screenSm"
           gap="3"
+          textAlign="center"
         >
           <Text as="h2" size="large" color="white" weight="semiBold">
             You{' '}
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx
index 612a0ed4..f6f9c131 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx
@@ -1,5 +1,5 @@
 import { Box, Button, Text, Textarea } from 'degen';
-import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { VoteSide } from 'helpers/dao';
 import { sum } from 'lodash';
 import invariant from 'tiny-invariant';
 
@@ -52,83 +52,49 @@ export const VoteSelectContents: React.FC<Props> = ({
               <Button
                 // tw="flex items-center gap-4 px-5 py-4 border rounded border-warmGray-600 transition-all"
                 key={voteSide}
-                // css={[
-                //   side === voteSide && {
-                //     borderColor: sideColor(voteSide)
-                //   }
-                // ]}
+                width="full"
                 onClick={() => setSide(voteSide)}
+                variant={side === voteSide ? 'primary' : 'tertiary'}
+                prefix={<Text>{VOTE_SIDE_LABEL[voteSide]}</Text>}
+                suffix={<Text>{percent}</Text>}
+                center
               >
-                <Box>
-                  <Box
-                    width="6"
-                    height="6"
-                    // css={[tw`border border-gray-500`, tw`w-6 h-6`]}
-                  >
-                    <svg
-                      // tw="w-full h-full"
-                      // css={[
-                      //   css`
-                      //     stroke-width: 15px;
-                      //     fill: none;
-                      //     & > path {
-                      //       stroke: ${sideColor(voteSide)};
-                      //     }
-                      //   `,
-                      //   side === voteSide &&
-                      //     css`
-                      //       & > path {
-                      //         stroke-dashoffset: 0;
-                      //         transition: stroke-dashoffset 0.1s ease-in 0s;
-                      //       }
-                      //     `
-                      // ]}
-                      viewBox="0 0 100 100"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      {voteSide === VoteSide.For ? (
-                        <path
-                          d="M 10 50 L 40 86 L 90 10"
-                          strokeDasharray="140"
-                          strokeDashoffset="140"
-                        ></path>
-                      ) : (
-                        <>
-                          <path
-                            d="M 10 10 L 90 90"
-                            strokeDasharray="113"
-                            strokeDashoffset="113"
-                          ></path>
-                          <path
-                            d="M 90 10 L 10 90"
-                            strokeDasharray="113"
-                            strokeDashoffset="113"
-                          ></path>
-                        </>
-                      )}
-                    </svg>
+                {/* <Box
+                  display="flex"
+                  alignItems="center"
+                  gap="4"
+                  paddingX="5"
+                  paddingY="4"
+                  width="full"
+                > */}
+                {/* <Box
+                  display="flex"
+                  flexDirection="column"
+                  flexGrow={1}
+                  // alignItems="center"
+                  gap="4"
+                  paddingX="5"
+                  paddingY="4"
+                  width="full"
+                > */}
+                {/* <Box
+                  width="full"
+                  display="flex"
+                  alignItems="center"
+                  justifyContent="space-between"
+                >
+                  <Box color="white" fontWeight="medium">
+                    {VOTE_SIDE_LABEL[voteSide]}
                   </Box>
-                </Box>
-                <Box display="flex" flexDirection="column" flexGrow={1}>
-                  <Box
-                    width="full"
-                    display="flex"
-                    alignItems="center"
-                    justifyContent="center"
-                  >
-                    <Box color="white" fontWeight="medium">
-                      {VOTE_SIDE_LABEL[voteSide]}
-                    </Box>
-                    <Box fontWeight="medium" color="accentText">
-                      {percent}
-                    </Box>
+                  <Box fontWeight="medium" color="accentText">
+                    {percent}
                   </Box>
-                  <Meter
-                    value={myVotes}
-                    max={totalVotes === 0 ? 1 : totalVotes}
-                    barColor={sideColor(voteSide)}
-                  />
-                </Box>
+                </Box> */}
+                <Meter
+                  value={myVotes}
+                  max={totalVotes === 0 ? 1 : totalVotes}
+                  barColor={sideColor(voteSide)}
+                />
               </Button>
             );
           }
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
index b2f0faba..8f09ee09 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
@@ -1,4 +1,4 @@
-import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { VoteSide } from 'helpers/dao';
 
 import type { ProposalInfo } from 'hooks/tribeca/useProposals';
 import { ModalButton } from 'components/Modal/ModalButton';
@@ -17,7 +17,8 @@ export const CastVoteButton: React.FC<Props> = ({
     <ModalButton
       // tw="max-w-md"
       buttonProps={{
-        variant: 'tertiary'
+        size: 'small',
+        width: '1/2'
         // css: tw`border-white w-2/5 hover:(border-primary bg-primary bg-opacity-20)`
       }}
       buttonLabel={
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
index 79d1582a..658c36de 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
@@ -1,11 +1,11 @@
 import type { SmartWalletTransactionData } from '@gokiprotocol/client';
 import type { ProgramAccount } from '@saberhq/token-utils';
-import type { ProposalData } from '@tribecahq/tribeca-sdk';
+import type { ProposalData } from 'helpers/dao';
 import {
   getProposalState,
   PROPOSAL_STATE_LABELS,
   ProposalState
-} from '@tribecahq/tribeca-sdk';
+} from 'helpers/dao';
 import BN from 'bn.js';
 import { startCase } from 'lodash';
 import { Box, IconLink, Text } from 'degen';
diff --git a/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx b/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
index 73ce423e..f711bf3e 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
@@ -1,6 +1,6 @@
 import { Fraction } from '@saberhq/token-utils';
-import type { ProposalData } from '@tribecahq/tribeca-sdk';
-import { VoteSide } from '@tribecahq/tribeca-sdk';
+import type { ProposalData } from 'helpers/dao';
+import { VoteSide } from 'helpers/dao';
 import { Box, Spinner } from 'degen';
 import BN from 'bn.js';
 
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
index 3e2df3c7..823f7281 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
@@ -83,11 +83,16 @@ export const ProposalActivate: React.FC<Props> = ({
           </Box>
         ) : minActivationThreshold &&
           veBalance?.greaterThan(minActivationThreshold) ? (
-          <Box display="flex" justifyContent="center" alignItems="center">
+          <Box
+            display="flex"
+            justifyContent="center"
+            alignItems="center"
+            width="full"
+          >
             <Button
               disabled={!escrow}
-              // tw="w-3/4 dark:text-white hover:dark:text-primary hover:dark:border-primary"
-              variant="tertiary"
+              size="small"
+              width="3/4"
               onClick={async () => {
                 invariant(escrow);
                 const tx = escrow.escrowW.activateProposal(
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
index c69140b4..635393e9 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
@@ -1,7 +1,7 @@
 import { ConnectWalletButton } from '@gokiprotocol/walletkit';
 import { TokenAmount } from '@saberhq/token-utils';
-import type { VoteSide } from '@tribecahq/tribeca-sdk';
-import { VOTE_SIDE_LABELS } from '@tribecahq/tribeca-sdk';
+import type { VoteSide } from 'helpers/dao';
+import { VOTE_SIDE_LABELS } from 'helpers/dao';
 
 import { useSDK } from 'helpers/sdk';
 import { useUserEscrow } from 'hooks/tribeca/useEscrow';
diff --git a/components/Proposals/ProposalIndexView/locked-voter/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
index e35d686a..6bd776d2 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
@@ -1,4 +1,4 @@
-import { ProposalState, VoteSide } from '@tribecahq/tribeca-sdk';
+import { ProposalState, VoteSide } from 'helpers/dao';
 import { noop } from 'lodash';
 import { useRouter } from 'next/router';
 
diff --git a/components/Proposals/ProposalsList/PlaceholderCard.tsx b/components/Proposals/ProposalsList/PlaceholderCard.tsx
index 2d29223e..e2bbdf28 100644
--- a/components/Proposals/ProposalsList/PlaceholderCard.tsx
+++ b/components/Proposals/ProposalsList/PlaceholderCard.tsx
@@ -1,4 +1,4 @@
-import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { ProposalState } from 'helpers/dao';
 import { Box, Skeleton } from 'degen';
 import React from 'react';
 
diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
index bda16b0a..251d7060 100644
--- a/components/Proposals/ProposalsList/ProposalCard.tsx
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -1,4 +1,4 @@
-import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { ProposalState } from 'helpers/dao';
 import { Box, Text } from 'degen';
 import Link from 'next/link';
 
@@ -10,18 +10,19 @@ import { ProposalStateBadge } from './ProposalStateBadge';
 import { ProposalStateDate } from './ProposalStateDate';
 import { ProposalStateLabel } from './ProposalStateLabel';
 import { PulsingDot } from 'icons/PulsingDot';
+import { useRouter } from 'next/router';
 
 interface Props {
   proposalInfo: ProposalInfo;
 }
 
 export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
-  // const { path } = useGovernor();
+  const router = useRouter();
   const { state, executed } = proposalInfo.status;
   return (
     <Link
       passHref
-      href={`proposals/${proposalInfo.index}`}
+      href={`${router.pathname}/proposals/${proposalInfo.index}`}
       // tw="flex items-center justify-between py-5 px-6 border-l-2 border-l-transparent border-b border-b-warmGray-800 cursor-pointer hover:border-l-primary"
     >
       <Box
@@ -39,7 +40,11 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
           width={{ md: '192', xs: '3/4' }}
           // tw="flex items-center gap-5 w-3/4 md:w-[500px]"
         >
-          {state === ProposalState.Active && <PulsingDot color="decendent" />}
+          {state === ProposalState.Active && (
+            <Box width="11" height="11">
+              <PulsingDot color="decendent" />
+            </Box>
+          )}
           <div>
             <Box display="flex" alignItems="center">
               <Text
diff --git a/components/Proposals/ProposalsList/ProposalStateBadge.tsx b/components/Proposals/ProposalsList/ProposalStateBadge.tsx
index 8310b7dc..5f5a5d51 100644
--- a/components/Proposals/ProposalsList/ProposalStateBadge.tsx
+++ b/components/Proposals/ProposalsList/ProposalStateBadge.tsx
@@ -1,4 +1,4 @@
-import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { ProposalState } from 'helpers/dao';
 import { startCase } from 'lodash';
 import {
   IconCheck,
diff --git a/components/Proposals/ProposalsList/ProposalStateDate.tsx b/components/Proposals/ProposalsList/ProposalStateDate.tsx
index 7d9a0dc4..cd7da4af 100644
--- a/components/Proposals/ProposalsList/ProposalStateDate.tsx
+++ b/components/Proposals/ProposalsList/ProposalStateDate.tsx
@@ -1,5 +1,5 @@
-import type { ProposalData } from '@tribecahq/tribeca-sdk';
-import { ProposalState } from '@tribecahq/tribeca-sdk';
+import type { ProposalData } from 'helpers/dao';
+import { ProposalState } from 'helpers/dao';
 import type BN from 'bn.js';
 import Countdown from 'react-countdown';
 
diff --git a/components/Proposals/ProposalsList/ProposalStateLabel.tsx b/components/Proposals/ProposalsList/ProposalStateLabel.tsx
index dbea0f39..9ca4a1c6 100644
--- a/components/Proposals/ProposalsList/ProposalStateLabel.tsx
+++ b/components/Proposals/ProposalsList/ProposalStateLabel.tsx
@@ -1,4 +1,4 @@
-import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { ProposalState } from 'helpers/dao';
 import { Box, BoxProps, Text } from 'degen';
 import { startCase } from 'lodash';
 
@@ -20,8 +20,8 @@ export const ProposalStateLabel: React.FC<Props> = ({
   state,
   executed
 }: Props) => {
-  let borderColor: BoxProps['color'] = 'inherit';
-  let textColor: BoxProps['color'] = 'inherit';
+  let borderColor: BoxProps['color'] = 'accent';
+  let textColor: BoxProps['color'] = 'accent';
   if (
     state === ProposalState.Canceled ||
     state === ProposalState.Defeated ||
diff --git a/components/Proposals/ProposalsList/index.tsx b/components/Proposals/ProposalsList/index.tsx
index 3f3db7dc..486799e5 100644
--- a/components/Proposals/ProposalsList/index.tsx
+++ b/components/Proposals/ProposalsList/index.tsx
@@ -1,4 +1,4 @@
-import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { ProposalState } from 'helpers/dao';
 import { useState } from 'react';
 import Link from 'next/link';
 
diff --git a/components/common/governance/Meter.tsx b/components/common/governance/Meter.tsx
index d393f8ba..76c902e1 100644
--- a/components/common/governance/Meter.tsx
+++ b/components/common/governance/Meter.tsx
@@ -25,7 +25,7 @@ export const Meter: React.FC<Props> = ({
       flexGrow={1}
       backgroundColor="accent"
       height="1"
-      borderRadius="medium"
+      borderRadius="full"
     >
       <Box
         style={{
@@ -33,7 +33,7 @@ export const Meter: React.FC<Props> = ({
           backgroundColor: barColor
         }}
         height="1"
-        borderRadius="medium"
+        borderRadius="full"
         backgroundColor="backgroundSecondary"
         // tw="bg-primary h-1 rounded transition-all"
       />
diff --git a/helpers/dao/constants.ts b/helpers/dao/constants.ts
new file mode 100644
index 00000000..7dd2ee95
--- /dev/null
+++ b/helpers/dao/constants.ts
@@ -0,0 +1,92 @@
+import { buildCoderMap } from '@saberhq/anchor-contrib';
+import { PublicKey } from '@solana/web3.js';
+import BN from 'bn.js';
+import { GovernJSON } from 'helpers/types/govern';
+import { IDL as LockedVoterJSON } from 'helpers/types/ve_honey';
+
+import type {
+  GovernanceParameters,
+  GovernProgram,
+  GovernTypes,
+  LockedVoterProgram,
+  LockedVoterTypes,
+  LockerParamsV2
+} from './programs';
+
+/**
+ * Tribeca program types.
+ */
+export interface TribecaPrograms {
+  Govern: GovernProgram;
+  LockedVoter: LockedVoterProgram;
+}
+
+// See `Anchor.toml` for all addresses.
+export const HONEY_DAO_ADDRESSES = {
+  Govern: new PublicKey('Govz1VyoyLD5BL6CSCxUJLVLsQHRwjfFj1prNsdNg5Jw'),
+  LockedVoter: new PublicKey(process.env.NEXT_PUBLIC_VOTE_PROGRAM_ID!)
+};
+
+/**
+ * Program IDLs.
+ */
+export const HONEY_DAO_IDLS = {
+  Govern: GovernJSON,
+  LockedVoter: LockedVoterJSON
+};
+
+/**
+ * Coders.
+ */
+export const HONEY_DAO_CODERS = buildCoderMap<{
+  Govern: GovernTypes;
+  LockedVoter: LockedVoterTypes;
+}>(HONEY_DAO_IDLS, HONEY_DAO_ADDRESSES);
+
+export const DEFAULT_DECIMALS = 6;
+
+export const ONE_DAY = new BN(24 * 60 * 60);
+
+/**
+ * Number of seconds in one year.
+ */
+export const ONE_YEAR = new BN(365).mul(ONE_DAY);
+
+// Default number of votes in support of a proposal required in order for a quorum to be reached and for a vote to succeed
+// ~ 4% of 10 billion
+export const DEFAULT_QUORUM_VOTES = new BN(10000000000 * 0.04).mul(
+  new BN(10).pow(new BN(DEFAULT_DECIMALS))
+);
+// Default number of votes required in order for a voter to become a proposer
+// ~ 1% of 10 billion
+export const DEFAULT_PROPOSAL_THRESHOLD = new BN(10000000000 * 0.01).mul(
+  new BN(10).pow(new BN(DEFAULT_DECIMALS))
+);
+// Default delay before voting on a proposal may take place, once proposed, ~ 1 second
+export const DEFAULT_VOTE_DELAY = new BN(1);
+// Default duration of voting on a proposal, in seconds, ~ 3 days
+export const DEFAULT_VOTE_PERIOD = new BN(3).mul(ONE_DAY);
+
+/**
+ * Default parameters for a Governor.
+ */
+export const DEFAULT_GOVERNANCE_PARAMETERS: GovernanceParameters = {
+  timelockDelaySeconds: new BN(0),
+  quorumVotes: DEFAULT_QUORUM_VOTES,
+  votingDelay: DEFAULT_VOTE_DELAY,
+  votingPeriod: DEFAULT_VOTE_PERIOD
+};
+
+/**
+ * Default parameters for a Locker.
+ */
+export const DEFAULT_LOCKER_PARAMS: LockerParamsV2 = {
+  // 1M tokens if max locked.
+  proposalActivationMinVotes: new BN(10_000_000 * 10 ** 6),
+  // 1 day.
+  minStakeDuration: ONE_DAY,
+  // 5 years.
+  maxStakeDuration: new BN(5).mul(ONE_YEAR),
+  multiplier: 10,
+  whitelistEnabled: false
+};
diff --git a/helpers/dao/index.ts b/helpers/dao/index.ts
new file mode 100644
index 00000000..8a5ce295
--- /dev/null
+++ b/helpers/dao/index.ts
@@ -0,0 +1,4 @@
+export * from "./constants";
+export * from "./programs";
+export * from "./sdk";
+export * from "./wrappers";
diff --git a/helpers/dao/programs/govern.ts b/helpers/dao/programs/govern.ts
new file mode 100644
index 00000000..1d8f114a
--- /dev/null
+++ b/helpers/dao/programs/govern.ts
@@ -0,0 +1,39 @@
+import type { AnchorTypes } from '@saberhq/anchor-contrib';
+import type { AccountMeta } from '@solana/web3.js';
+
+import type { GovernIDL } from '../../types/govern';
+
+export * from '../../types/govern';
+
+export type GovernTypes = AnchorTypes<
+  GovernIDL,
+  {
+    governor: GovernorData;
+    proposal: ProposalData;
+    vote: VoteData;
+    proposalMeta: ProposalMetaData;
+  },
+  {
+    ProposalInstruction: ProposalInstruction;
+    ProposalAccountMeta: AccountMeta;
+    GovernanceParameters: GovernanceParameters;
+  }
+>;
+
+type Accounts = GovernTypes['Accounts'];
+export type GovernorData = Accounts['Governor'];
+export type ProposalData = Accounts['Proposal'];
+export type VoteData = Accounts['Vote'];
+export type ProposalMetaData = Accounts['ProposalMeta'] & {
+  title: string;
+  descriptionLink: string;
+};
+
+export type GovernanceParameters =
+  GovernTypes['Defined']['GovernanceParameters'];
+export type ProposalInstruction =
+  GovernTypes['Defined']['ProposalInstruction'] & {
+    keys: AccountMeta[];
+  };
+
+export type GovernProgram = GovernTypes['Program'];
diff --git a/helpers/dao/programs/index.ts b/helpers/dao/programs/index.ts
new file mode 100644
index 00000000..ed9900ed
--- /dev/null
+++ b/helpers/dao/programs/index.ts
@@ -0,0 +1,2 @@
+export * from './govern';
+export * from './lockedVoter';
diff --git a/helpers/dao/programs/lockedVoter.ts b/helpers/dao/programs/lockedVoter.ts
new file mode 100644
index 00000000..854022dc
--- /dev/null
+++ b/helpers/dao/programs/lockedVoter.ts
@@ -0,0 +1,22 @@
+import type { AnchorTypes } from '@saberhq/anchor-contrib';
+
+import type { VeHoney as VoterIDL } from '../../types/ve_honey';
+
+export type LockedVoterTypes = AnchorTypes<
+  VoterIDL,
+  {
+    lockerV2: LockerV2Data;
+    escrowV2: EscrowV2Data;
+    lockerWhitelistEntry: LockerWhitelistEntryData;
+  }
+>;
+
+type Accounts = LockedVoterTypes['Accounts'];
+export type LockerV2Data = Accounts['lockerV2'];
+export type EscrowV2Data = Accounts['escrowV2'];
+export type LockerWhitelistEntryData = Accounts['whitelistEntry'];
+
+export type LockerParamsV2 = LockedVoterTypes['Defined']['LockerParamsV2'];
+
+export type LockedVoterError = LockedVoterTypes['Error'];
+export type LockedVoterProgram = LockedVoterTypes['Program'];
diff --git a/helpers/dao/sdk.ts b/helpers/dao/sdk.ts
new file mode 100644
index 00000000..4f2c0b53
--- /dev/null
+++ b/helpers/dao/sdk.ts
@@ -0,0 +1,101 @@
+import type { BN } from '@project-serum/anchor';
+import { newProgramMap } from '@saberhq/anchor-contrib';
+import type { AugmentedProvider, Provider } from '@saberhq/solana-contrib';
+import {
+  SolanaAugmentedProvider,
+  TransactionEnvelope
+} from '@saberhq/solana-contrib';
+import type { PublicKey, Signer } from '@solana/web3.js';
+import { Keypair, SystemProgram } from '@solana/web3.js';
+
+import type { TribecaPrograms } from './constants';
+import {
+  DEFAULT_LOCKER_PARAMS,
+  HONEY_DAO_ADDRESSES,
+  HONEY_DAO_IDLS
+} from './constants';
+import type { LockerParamsV2 } from './programs/lockedVoter';
+import { GovernWrapper } from './wrappers';
+import { findLockerAddress } from './wrappers/lockedVoter/pda';
+
+/**
+ * TribecaSDK.
+ */
+export class TribecaSDK {
+  constructor(
+    readonly provider: AugmentedProvider,
+    readonly programs: TribecaPrograms
+  ) {}
+
+  /**
+   * Creates a new instance of the SDK with the given keypair.
+   */
+  withSigner(signer: Signer): TribecaSDK {
+    return TribecaSDK.load({
+      provider: this.provider.withSigner(signer)
+    });
+  }
+
+  /**
+   * Loads the SDK.
+   * @returns
+   */
+  static load({ provider }: { provider: Provider }): TribecaSDK {
+    const programs: TribecaPrograms = newProgramMap<TribecaPrograms>(
+      provider,
+      HONEY_DAO_IDLS,
+      HONEY_DAO_ADDRESSES
+    );
+    return new TribecaSDK(new SolanaAugmentedProvider(provider), programs);
+  }
+
+  /**
+   * Govern program helpers.
+   */
+  get govern(): GovernWrapper {
+    return new GovernWrapper(this);
+  }
+
+  /**
+   * Creates a Locker, which is an Electorate that supports vote locking.
+   * @returns
+   */
+  async createLocker({
+    governor,
+    govTokenMint,
+    baseKP = Keypair.generate(),
+    ...providedLockerParams
+  }: {
+    baseKP?: Keypair;
+    governor: PublicKey;
+    govTokenMint: PublicKey;
+  } & Partial<LockerParamsV2>): Promise<{
+    locker: PublicKey;
+    tx: TransactionEnvelope;
+  }> {
+    const [locker] = await findLockerAddress(baseKP.publicKey);
+    const lockerParams = {
+      ...DEFAULT_LOCKER_PARAMS,
+      ...providedLockerParams
+    };
+    return {
+      locker,
+      tx: new TransactionEnvelope(
+        this.provider,
+        [
+          this.programs.LockedVoter.instruction.initLockerV2(lockerParams, {
+            accounts: {
+              base: baseKP.publicKey,
+              governor,
+              locker,
+              tokenMint: govTokenMint,
+              payer: this.provider.wallet.publicKey,
+              systemProgram: SystemProgram.programId
+            }
+          })
+        ],
+        [baseKP]
+      )
+    };
+  }
+}
diff --git a/helpers/dao/wrappers/govern/govern.ts b/helpers/dao/wrappers/govern/govern.ts
new file mode 100644
index 00000000..c422dccf
--- /dev/null
+++ b/helpers/dao/wrappers/govern/govern.ts
@@ -0,0 +1,71 @@
+import { TransactionEnvelope } from "@saberhq/solana-contrib";
+import type { PublicKey } from "@solana/web3.js";
+import { Keypair, SystemProgram } from "@solana/web3.js";
+import type BN from "bn.js";
+
+import { DEFAULT_GOVERNANCE_PARAMETERS } from "../..";
+import type { GovernProgram, VoteData } from "../../programs/govern";
+import type { TribecaSDK } from "../../sdk";
+import { GovernorWrapper } from "./governor";
+import { findGovernorAddress } from "./pda";
+import type { PendingGovernor } from "./types";
+
+export class GovernWrapper {
+  readonly program: GovernProgram;
+
+  constructor(readonly sdk: TribecaSDK) {
+    this.program = sdk.programs.Govern;
+  }
+
+  get provider() {
+    return this.sdk.provider;
+  }
+
+  async fetchVote(key: PublicKey): Promise<VoteData> {
+    return await this.program.account.vote.fetch(key);
+  }
+
+  async createGovernor({
+    electorate,
+    smartWallet,
+    baseKP = Keypair.generate(),
+    ...governorParams
+  }: {
+    electorate: PublicKey;
+    smartWallet: PublicKey;
+    baseKP?: Keypair;
+    quorumVotes?: BN;
+    votingDelay?: BN;
+    votingPeriod?: BN;
+    smartWalletOwner?: PublicKey;
+  }): Promise<PendingGovernor> {
+    const [governor, bump] = await findGovernorAddress(baseKP.publicKey);
+    const wrapper = new GovernorWrapper(this.sdk, governor);
+    return {
+      wrapper,
+      tx: new TransactionEnvelope(
+        this.provider,
+        [
+          this.sdk.programs.Govern.instruction.createGovernor(
+            bump,
+            electorate,
+            {
+              ...DEFAULT_GOVERNANCE_PARAMETERS,
+              ...governorParams,
+            },
+            {
+              accounts: {
+                base: baseKP.publicKey,
+                governor,
+                smartWallet,
+                payer: this.provider.wallet.publicKey,
+                systemProgram: SystemProgram.programId,
+              },
+            }
+          ),
+        ],
+        [baseKP]
+      ),
+    };
+  }
+}
diff --git a/helpers/dao/wrappers/govern/governor.ts b/helpers/dao/wrappers/govern/governor.ts
new file mode 100644
index 00000000..6cc3ac25
--- /dev/null
+++ b/helpers/dao/wrappers/govern/governor.ts
@@ -0,0 +1,280 @@
+import {
+  findTransactionAddress,
+  GOKI_ADDRESSES,
+  GOKI_CODERS,
+} from "@gokiprotocol/client";
+import { TransactionEnvelope } from "@saberhq/solana-contrib";
+import { u64 } from "@saberhq/token-utils";
+import type { PublicKey, TransactionInstruction } from "@solana/web3.js";
+import { SystemProgram } from "@solana/web3.js";
+import type BN from "bn.js";
+
+import type {
+  GovernanceParameters,
+  GovernorData,
+  ProposalData,
+  ProposalInstruction,
+  ProposalMetaData,
+} from "../../programs/govern";
+import type { TribecaSDK } from "../../sdk";
+import type { PendingProposal } from "../simpleVoter/types";
+import {
+  findProposalAddress,
+  findProposalMetaAddress,
+  findVoteAddress,
+} from "./pda";
+
+/**
+ * Wrapper around a Governor.
+ */
+export class GovernorWrapper {
+  private _governor: GovernorData | null = null;
+
+  constructor(readonly sdk: TribecaSDK, readonly governorKey: PublicKey) {}
+
+  get provider() {
+    return this.sdk.provider;
+  }
+
+  get program() {
+    return this.sdk.programs.Govern;
+  }
+
+  async reload(): Promise<GovernorData> {
+    return await this.program.account.governor.fetch(this.governorKey);
+  }
+
+  async data(): Promise<GovernorData> {
+    if (!this._governor) {
+      this._governor = await this.reload();
+    }
+    return this._governor;
+  }
+
+  async findProposalAddress(index: BN): Promise<PublicKey> {
+    const [key] = await findProposalAddress(this.governorKey, index);
+    return key;
+  }
+
+  async fetchProposalByKey(key: PublicKey): Promise<ProposalData> {
+    return await this.program.account.proposal.fetch(key);
+  }
+
+  async fetchProposal(index: BN): Promise<ProposalData> {
+    const key = await this.findProposalAddress(index);
+    return await this.fetchProposalByKey(key);
+  }
+
+  async fetchProposalMeta(proposalKey: PublicKey): Promise<ProposalMetaData> {
+    const [key] = await findProposalMetaAddress(proposalKey);
+    return await this.program.account.proposalMeta.fetch(key);
+  }
+
+  /**
+   * Creates a ProposalMeta for a proposal.
+   * Only the Proposer may call this.
+   *
+   * @returns
+   */
+  async createProposalMeta({
+    proposal,
+    proposer = this.sdk.provider.wallet.publicKey,
+    title,
+    descriptionLink,
+  }: {
+    proposal: PublicKey;
+    proposer?: PublicKey;
+    title: string;
+    descriptionLink: string;
+  }): Promise<TransactionEnvelope> {
+    const [proposalMetaKey, bump] = await findProposalMetaAddress(proposal);
+    const ix = this.sdk.programs.Govern.instruction.createProposalMeta(
+      bump,
+      title,
+      descriptionLink,
+      {
+        accounts: {
+          proposal,
+          proposer,
+          proposalMeta: proposalMetaKey,
+          payer: this.provider.wallet.publicKey,
+          systemProgram: SystemProgram.programId,
+        },
+      }
+    );
+    return this.provider.newTX([ix]);
+  }
+
+  /**
+   * Creates a new Proposal.
+   * @returns
+   */
+  async createProposal({
+    proposer = this.sdk.provider.wallet.publicKey,
+    instructions,
+  }: {
+    proposer?: PublicKey;
+    instructions: ProposalInstruction[];
+  }): Promise<PendingProposal> {
+    const { provider } = this.sdk;
+
+    const governorData = await this.reload();
+    const index = new u64(governorData.proposalCount);
+    const [proposal, bump] = await findProposalAddress(this.governorKey, index);
+
+    const ixs: TransactionInstruction[] = [];
+
+    ixs.push(
+      this.sdk.programs.Govern.instruction.createProposal(bump, instructions, {
+        accounts: {
+          governor: this.governorKey,
+          proposal,
+          proposer,
+          payer: provider.wallet.publicKey,
+          systemProgram: SystemProgram.programId,
+        },
+      })
+    );
+
+    return {
+      proposal,
+      index,
+      tx: this.provider.newTX(ixs),
+    };
+  }
+
+  /**
+   * Queues a Proposal for execution by the Smart Wallet.
+   * @returns
+   */
+  async queueProposal({
+    index,
+    smartWalletProgram = GOKI_ADDRESSES.SmartWallet,
+    payer = this.provider.wallet.publicKey,
+  }: {
+    index: BN;
+    smartWalletProgram?: PublicKey;
+    payer?: PublicKey;
+  }): Promise<TransactionEnvelope> {
+    const governorData = await this.data();
+
+    const [proposal] = await findProposalAddress(this.governorKey, index);
+    const smartWalletDataRaw =
+      await this.program.provider.connection.getAccountInfo(
+        governorData.smartWallet
+      );
+    if (!smartWalletDataRaw) {
+      throw new Error("smart wallet not found");
+    }
+    const smartWalletData = GOKI_CODERS.SmartWallet.accountParsers.smartWallet(
+      smartWalletDataRaw.data
+    );
+    const [txKey, txBump] = await findTransactionAddress(
+      governorData.smartWallet,
+      smartWalletData.numTransactions.toNumber()
+    );
+    return new TransactionEnvelope(this.sdk.provider, [
+      this.program.instruction.queueProposal(txBump, {
+        accounts: {
+          governor: this.governorKey,
+          proposal,
+          smartWallet: governorData.smartWallet,
+          smartWalletProgram,
+          transaction: txKey,
+          payer,
+          systemProgram: SystemProgram.programId,
+        },
+      }),
+    ]);
+  }
+
+  /**
+   * Cancel a new Proposal.
+   * @returns
+   */
+  cancelProposal({
+    proposal,
+    proposer = this.sdk.provider.wallet.publicKey,
+  }: {
+    proposal: PublicKey;
+    proposer?: PublicKey;
+  }): TransactionEnvelope {
+    return new TransactionEnvelope(this.sdk.provider, [
+      this.sdk.programs.Govern.instruction.cancelProposal({
+        accounts: {
+          governor: this.governorKey,
+          proposal,
+          proposer,
+        },
+      }),
+    ]);
+  }
+
+  async getOrCreateVote({
+    proposal,
+    voter = this.sdk.provider.wallet.publicKey,
+    payer = this.sdk.provider.wallet.publicKey,
+  }: {
+    proposal: PublicKey;
+    voter?: PublicKey;
+    payer?: PublicKey;
+  }): Promise<{
+    voteKey: PublicKey;
+    instruction: TransactionInstruction | null;
+  }> {
+    const [voteKey, bump] = await findVoteAddress(proposal, voter);
+
+    try {
+      await this.program.account.vote.fetch(voteKey);
+      return { voteKey, instruction: null };
+    } catch {
+      return {
+        voteKey,
+        instruction: await this.createVoteIx({
+          proposal,
+          voteKeyAndBump: [voteKey, bump],
+          voter,
+          payer,
+        }),
+      };
+    }
+  }
+
+  async createVoteIx({
+    proposal,
+    voteKeyAndBump,
+    voter = this.sdk.provider.wallet.publicKey,
+    payer = this.sdk.provider.wallet.publicKey,
+  }: {
+    proposal: PublicKey;
+    voteKeyAndBump?: [PublicKey, number];
+    voter?: PublicKey;
+    payer?: PublicKey;
+  }): Promise<TransactionInstruction> {
+    if (!voteKeyAndBump) {
+      voteKeyAndBump = await findVoteAddress(proposal, voter);
+    }
+
+    const [voteKey, bump] = voteKeyAndBump;
+    return this.program.instruction.newVote(bump, voter, {
+      accounts: {
+        vote: voteKey,
+        proposal,
+        payer,
+        systemProgram: SystemProgram.programId,
+      },
+    });
+  }
+
+  async setGovernanceParamsIx(
+    newParams: GovernanceParameters
+  ): Promise<TransactionInstruction> {
+    const { smartWallet } = await this.data();
+    return this.program.instruction.setGovernanceParams(newParams, {
+      accounts: {
+        governor: this.governorKey,
+        smartWallet,
+      },
+    });
+  }
+}
diff --git a/helpers/dao/wrappers/govern/index.ts b/helpers/dao/wrappers/govern/index.ts
new file mode 100644
index 00000000..4451c6c3
--- /dev/null
+++ b/helpers/dao/wrappers/govern/index.ts
@@ -0,0 +1,6 @@
+export * from "./govern";
+export * from "./governor";
+export * from "./pda";
+export * from "./proposal";
+export * from "./setup";
+export * from "./types";
diff --git a/helpers/dao/wrappers/govern/pda.ts b/helpers/dao/wrappers/govern/pda.ts
new file mode 100644
index 00000000..3cc110a7
--- /dev/null
+++ b/helpers/dao/wrappers/govern/pda.ts
@@ -0,0 +1,68 @@
+import { utils } from '@project-serum/anchor';
+import type { u64 } from '@saberhq/token-utils';
+import { PublicKey } from '@solana/web3.js';
+
+import { HONEY_DAO_ADDRESSES } from '../../constants';
+
+/**
+ * Finds the PDA of a Governor.
+ */
+export const findGovernorAddress = async (
+  base: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [utils.bytes.utf8.encode('TribecaGovernor'), base.toBuffer()],
+    HONEY_DAO_ADDRESSES.Govern
+  );
+};
+
+/**
+ * Finds the PDA of a Proposal.
+ */
+export const findProposalAddress = async (
+  governorKey: PublicKey,
+  index: u64
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [
+      utils.bytes.utf8.encode('TribecaProposal'),
+      governorKey.toBuffer(),
+      index.toArrayLike(Buffer, 'le', 8)
+    ],
+    HONEY_DAO_ADDRESSES.Govern
+  );
+};
+
+/**
+ * Finds the PDA of a Vote.
+ * @param proposalKey
+ * @param voterKey
+ * @returns
+ */
+export const findVoteAddress = async (
+  proposalKey: PublicKey,
+  voterKey: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [
+      utils.bytes.utf8.encode('TribecaVote'),
+      proposalKey.toBuffer(),
+      voterKey.toBuffer()
+    ],
+    HONEY_DAO_ADDRESSES.Govern
+  );
+};
+
+/**
+ * Finds the address of a ProposalMeta.
+ * @param proposalKey
+ * @returns
+ */
+export const findProposalMetaAddress = async (
+  proposalKey: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [utils.bytes.utf8.encode('TribecaProposalMeta'), proposalKey.toBuffer()],
+    HONEY_DAO_ADDRESSES.Govern
+  );
+};
diff --git a/helpers/dao/wrappers/govern/proposal.ts b/helpers/dao/wrappers/govern/proposal.ts
new file mode 100644
index 00000000..fdafb86a
--- /dev/null
+++ b/helpers/dao/wrappers/govern/proposal.ts
@@ -0,0 +1,35 @@
+import BN from 'bn.js';
+
+import type { ProposalData } from '../../programs/govern';
+import { ProposalState } from './types';
+
+/**
+ * Gets the state of a proposal.
+ * @returns
+ */
+export const getProposalState = ({
+  proposalData,
+  currentTimeSeconds = Math.floor(new Date().getTime() / 1_000)
+}: {
+  proposalData: ProposalData;
+  currentTimeSeconds?: number;
+}): ProposalState => {
+  if (proposalData.canceledAt.gt(new BN(0))) {
+    return ProposalState.Canceled;
+  } else if (proposalData.activatedAt.eq(new BN(0))) {
+    return ProposalState.Draft;
+  } else if (proposalData.votingEndsAt.gte(new BN(currentTimeSeconds))) {
+    return ProposalState.Active;
+  } else if (
+    proposalData.forVotes.lte(proposalData.againstVotes) ||
+    proposalData.forVotes
+      .add(proposalData.abstainVotes)
+      .add(proposalData.againstVotes)
+      .lt(proposalData.quorumVotes)
+  ) {
+    return ProposalState.Defeated;
+  } else if (proposalData.queuedAt.gt(new BN(0))) {
+    return ProposalState.Queued;
+  }
+  return ProposalState.Succeeded;
+};
diff --git a/helpers/dao/wrappers/govern/setup.ts b/helpers/dao/wrappers/govern/setup.ts
new file mode 100644
index 00000000..5c4dc8a0
--- /dev/null
+++ b/helpers/dao/wrappers/govern/setup.ts
@@ -0,0 +1,95 @@
+import type { GokiSDK, SmartWalletWrapper } from "@gokiprotocol/client";
+import type { TransactionEnvelope } from "@saberhq/solana-contrib";
+import type { PublicKey } from "@solana/web3.js";
+import { Keypair } from "@solana/web3.js";
+import BN from "bn.js";
+
+import type { GovernanceParameters, TribecaSDK } from "../..";
+import { DEFAULT_GOVERNANCE_PARAMETERS } from "../..";
+import type { GovernorWrapper } from "..";
+import { findGovernorAddress } from "..";
+
+/**
+ * Creates a Governor.
+ * @returns
+ */
+export const createGovernorWithElectorate = async ({
+  createElectorate,
+  sdk,
+  gokiSDK,
+  owners = [sdk.provider.wallet.publicKey],
+  governanceParameters = DEFAULT_GOVERNANCE_PARAMETERS,
+  govBaseKP = Keypair.generate(),
+  smartWalletBaseKP = Keypair.generate(),
+}: {
+  createElectorate: (
+    governor: PublicKey
+  ) => Promise<{ key: PublicKey; tx: TransactionEnvelope }>;
+  sdk: TribecaSDK;
+  gokiSDK: GokiSDK;
+  owners?: PublicKey[];
+  governanceParameters?: Partial<GovernanceParameters>;
+  /**
+   * Base of the governor.
+   */
+  govBaseKP?: Keypair;
+  /**
+   * Base of the smart wallet.
+   */
+  smartWalletBaseKP?: Keypair;
+}): Promise<{
+  governorWrapper: GovernorWrapper;
+  smartWalletWrapper: SmartWalletWrapper;
+  electorate: PublicKey;
+  createTXs: {
+    title: string;
+    tx: TransactionEnvelope;
+  }[];
+}> => {
+  const [governor] = await findGovernorAddress(govBaseKP.publicKey);
+
+  const createTXs: {
+    title: string;
+    tx: TransactionEnvelope;
+  }[] = [];
+
+  const { smartWalletWrapper, tx: tx1 } = await gokiSDK.newSmartWallet({
+    owners: [...owners, governor],
+    threshold: new BN(2),
+    numOwners: 3,
+    base: smartWalletBaseKP,
+  });
+  createTXs.push({
+    title: "Create Smart Wallet",
+    tx: tx1,
+  });
+
+  const { key: electorate, tx: createElectorateTX } = await createElectorate(
+    governor
+  );
+
+  const { wrapper: governorWrapper, tx: tx2 } = await sdk.govern.createGovernor(
+    {
+      ...governanceParameters,
+      baseKP: govBaseKP,
+      electorate,
+      smartWallet: smartWalletWrapper.key,
+    }
+  );
+  createTXs.push({
+    title: "Create Governor",
+    tx: tx2,
+  });
+
+  createTXs.push({
+    title: "Create Electorate",
+    tx: createElectorateTX,
+  });
+
+  return {
+    governorWrapper,
+    smartWalletWrapper,
+    createTXs,
+    electorate,
+  };
+};
diff --git a/helpers/dao/wrappers/govern/types.ts b/helpers/dao/wrappers/govern/types.ts
new file mode 100644
index 00000000..0812353e
--- /dev/null
+++ b/helpers/dao/wrappers/govern/types.ts
@@ -0,0 +1,97 @@
+import type { TransactionEnvelope } from "@saberhq/solana-contrib";
+import type { PublicKey } from "@solana/web3.js";
+
+import type { GovernorWrapper } from "./governor";
+
+export type PendingGovernor = {
+  wrapper: GovernorWrapper;
+  tx: TransactionEnvelope;
+};
+
+export type WhitelistArgs = {
+  canPropose: boolean;
+  activator: PublicKey;
+  smartWalletOwner?: PublicKey;
+};
+
+/**
+ * State of a proposal.
+ */
+export enum ProposalState {
+  /*
+   * Anyone can create a proposal on Tribeca. When a governance proposal is created,
+   * it is considered a [ProposalState::Draft] and enters a review period, after which voting weights
+   * are recorded and voting begins.
+   */
+  Draft,
+  /*
+   * Each DAO has requirements for who can activate proposals; a common way
+   * is to require the user to have a minimum amount of tokens.
+   * An [ProposalState::Active] proposal is one that is surfaced to the community to put up for voting.
+   */
+  Active,
+  /*
+   * If a proposal is still a [ProposalState::Draft], a proposal may be canceled by its creator.
+   * A canceled proposal cannot be reactivated; it simply just exists as a record.
+   */
+  Canceled,
+  /*
+   * After the voting period ends, votes are tallied up. A proposal is [ProposalState::Defeated] if one of
+   * two scenarios happen:
+   * - More or equal votes are [VoteSide::Against] than [VoteSide::For].
+   * - The sum of all votes does not meet quorum.
+   */
+  Defeated,
+  /*
+   * A proposal is [ProposalState::Succeeded] if it is not defeated and voting is over.
+   */
+  Succeeded,
+  /*
+   * A succeeded proposal may be [ProposalState::Queued] into the [SmartWallet].
+   */
+  Queued,
+}
+
+/**
+ * Labels for proposal states.
+ */
+export const PROPOSAL_STATE_LABELS: { [K in ProposalState]: string } = {
+  [ProposalState.Active]: "Active",
+  [ProposalState.Draft]: "Draft",
+  [ProposalState.Canceled]: "Canceled",
+  [ProposalState.Defeated]: "Defeated",
+  [ProposalState.Succeeded]: "Succeeded",
+  [ProposalState.Queued]: "Queued",
+} as const;
+
+/**
+ * Side of a vote.
+ */
+export enum VoteSide {
+  /**
+   * A vote that has not been set or has been unset.
+   */
+  Pending = 0,
+  /**
+   * Vote against the passing of the proposal.
+   */
+  Against = 1,
+  /**
+   * Vote to make the proposal pass.
+   */
+  For = 2,
+  /**
+   * This vote does not count as a `For` or `Against`, but it still contributes to quorum.
+   */
+  Abstain = 3,
+}
+
+/**
+ * Labels for vote sides.
+ */
+export const VOTE_SIDE_LABELS: { [K in VoteSide]: string } = {
+  [VoteSide.For]: "For",
+  [VoteSide.Against]: "Against",
+  [VoteSide.Abstain]: "Abstain",
+  [VoteSide.Pending]: "Pending",
+};
diff --git a/helpers/dao/wrappers/index.ts b/helpers/dao/wrappers/index.ts
new file mode 100644
index 00000000..ed9900ed
--- /dev/null
+++ b/helpers/dao/wrappers/index.ts
@@ -0,0 +1,2 @@
+export * from './govern';
+export * from './lockedVoter';
diff --git a/helpers/dao/wrappers/lockedVoter/escrow.ts b/helpers/dao/wrappers/lockedVoter/escrow.ts
new file mode 100644
index 00000000..467d32da
--- /dev/null
+++ b/helpers/dao/wrappers/lockedVoter/escrow.ts
@@ -0,0 +1,231 @@
+import type { TransactionEnvelope } from '@saberhq/solana-contrib';
+import type { TokenAmount } from '@saberhq/token-utils';
+import {
+  getATAAddress,
+  getOrCreateATA,
+  TOKEN_PROGRAM_ID
+} from '@saberhq/token-utils';
+import type { PublicKey, TransactionInstruction } from '@solana/web3.js';
+import { SystemProgram } from '@solana/web3.js';
+import BN from 'bn.js';
+
+import { HONEY_DAO_ADDRESSES } from '../../constants';
+import type { EscrowV2Data, LockerV2Data } from '../../programs/lockedVoter';
+import type { TribecaSDK } from '../../sdk';
+import { findVoteAddress } from '../govern/pda';
+import type { VoteSide } from '../govern/types';
+
+export class VoteEscrow {
+  private _lockerData: LockerV2Data | null = null;
+  private _escrowData: EscrowV2Data | null = null;
+
+  constructor(
+    readonly sdk: TribecaSDK,
+    readonly locker: PublicKey,
+    readonly governorKey: PublicKey,
+    readonly escrowKey: PublicKey,
+    readonly owner: PublicKey
+  ) {}
+
+  get provider() {
+    return this.sdk.provider;
+  }
+
+  get lockerProgram() {
+    return this.sdk.programs.LockedVoter;
+  }
+
+  /**
+   * Locker data.
+   */
+  async lockerData() {
+    if (!this._lockerData) {
+      this._lockerData = await this.lockerProgram.account.lockerV2.fetch(
+        this.locker
+      );
+    }
+    return this._lockerData;
+  }
+
+  /**
+   * Escrow data.
+   */
+  async data() {
+    if (!this._escrowData) {
+      this._escrowData = await this.lockerProgram.account.escrowV2.fetch(
+        this.escrowKey
+      );
+    }
+    return this._escrowData;
+  }
+
+  /**
+   * Creates a function to calculate the voting power of this escrow.
+   * @returns
+   */
+  async makeCalculateVotingPower(): Promise<(timestampSeconds: number) => BN> {
+    const escrowData = await this.data();
+    const lockerData = await this.lockerData();
+    return (timestampSeconds: number) => {
+      if (escrowData.escrowStartedAt.eq(new BN(0))) {
+        return new BN(0);
+      }
+      if (
+        timestampSeconds < escrowData.escrowStartedAt.toNumber() ||
+        timestampSeconds >= escrowData.escrowEndsAt.toNumber()
+      ) {
+        return new BN(0);
+      }
+      const secondsUntilLockupExpiry = escrowData.escrowEndsAt
+        .sub(new BN(timestampSeconds))
+        .toNumber();
+      const relevantSecondsUntilLockupExpiry = Math.min(
+        secondsUntilLockupExpiry,
+        lockerData.params.maxStakeDuration.toNumber()
+      );
+      const powerIfMaxLockup = escrowData.amount.mul(
+        new BN(lockerData.params.multiplier)
+      );
+      return powerIfMaxLockup
+        .mul(new BN(relevantSecondsUntilLockupExpiry))
+        .div(lockerData.params.maxStakeDuration);
+    };
+  }
+
+  /**
+   * Calculates the voting power of this escrow.
+   * @param time Optional time to calculate power for.
+   * @returns
+   */
+  async calculateVotingPower(time: Date = new Date()): Promise<BN> {
+    return (await this.makeCalculateVotingPower())(
+      Math.floor(time.getTime() / 1_000)
+    );
+  }
+
+  /**
+   * Activates a proposal.
+   * @returns
+   */
+  activateProposal(proposal: PublicKey): TransactionEnvelope {
+    return this.provider.newTX([
+      this.lockerProgram.instruction.activateProposal({
+        accounts: {
+          locker: this.locker,
+          governor: this.governorKey,
+          proposal,
+          escrow: this.escrowKey,
+          escrowOwner: this.owner,
+          governProgram: HONEY_DAO_ADDRESSES.Govern
+        }
+      })
+    ]);
+  }
+
+  /**
+   * Casts a vote on a proposal.
+   * @returns
+   */
+  async castVote({
+    proposal,
+    side
+  }: {
+    proposal: PublicKey;
+    side: VoteSide;
+  }): Promise<TransactionEnvelope> {
+    const [voteKey, voteBump] = await findVoteAddress(proposal, this.owner);
+    const vote = await this.provider.getAccountInfo(voteKey);
+    let createVoteIX: TransactionInstruction | null = null;
+    if (!vote) {
+      createVoteIX = this.sdk.programs.Govern.instruction.newVote(
+        voteBump,
+        this.owner,
+        {
+          accounts: {
+            proposal,
+            vote: voteKey,
+            payer: this.provider.wallet.publicKey,
+            systemProgram: SystemProgram.programId
+          }
+        }
+      );
+    }
+    return this.provider.newTX([
+      createVoteIX,
+      this.lockerProgram.instruction.castVote(side, {
+        accounts: {
+          locker: this.locker,
+          escrow: this.escrowKey,
+          voteDelegate: this.owner,
+          proposal,
+          vote: voteKey,
+          governor: this.governorKey,
+          governProgram: HONEY_DAO_ADDRESSES.Govern
+        }
+      })
+    ]);
+  }
+
+  /**
+   * Locks tokens into the escrow.
+   * @param amount
+   * @param durationSeconds The duration of the lock, in seconds
+   * @param authority
+   * @returns
+   */
+  async lock(
+    amount: TokenAmount,
+    durationSeconds: number
+  ): Promise<TransactionEnvelope> {
+    const escrowData = await this.data();
+    const sourceTokens = await getATAAddress({
+      mint: amount.token.mintAccount,
+      owner: escrowData.owner
+    });
+    return this.provider.newTX([
+      this.lockerProgram.instruction.lockV2(
+        amount.toU64(),
+        new BN(durationSeconds),
+        {
+          accounts: {
+            locker: this.locker,
+            escrow: this.escrowKey,
+            lockedTokens: escrowData.tokens,
+            escrowOwner: escrowData.owner,
+            sourceTokens,
+            sourceTokensAuthority: this.owner,
+            tokenProgram: TOKEN_PROGRAM_ID
+          }
+        }
+      )
+    ]);
+  }
+
+  /**
+   * Exits the escrow.
+   * @returns
+   */
+  async exit(): Promise<TransactionEnvelope> {
+    const lockerData = await this.lockerData();
+    const escrowData = await this.data();
+    const destinationTokens = await getOrCreateATA({
+      provider: this.provider,
+      mint: lockerData.tokenMint,
+      owner: escrowData.owner
+    });
+    return this.provider.newTX([
+      destinationTokens.instruction,
+      this.lockerProgram.instruction.exitV2({
+        accounts: {
+          locker: this.locker,
+          escrow: this.escrowKey,
+          escrowOwner: escrowData.owner,
+          lockedTokens: escrowData.tokens,
+          destinationTokens: destinationTokens.address,
+          payer: this.provider.wallet.publicKey,
+          tokenProgram: TOKEN_PROGRAM_ID
+        }
+      })
+    ]);
+  }
+}
diff --git a/helpers/dao/wrappers/lockedVoter/index.ts b/helpers/dao/wrappers/lockedVoter/index.ts
new file mode 100644
index 00000000..29746bba
--- /dev/null
+++ b/helpers/dao/wrappers/lockedVoter/index.ts
@@ -0,0 +1,4 @@
+export * from "./escrow";
+export * from "./locker";
+export * from "./pda";
+export * from "./setup";
diff --git a/helpers/dao/wrappers/lockedVoter/locker.ts b/helpers/dao/wrappers/lockedVoter/locker.ts
new file mode 100644
index 00000000..832cd9a1
--- /dev/null
+++ b/helpers/dao/wrappers/lockedVoter/locker.ts
@@ -0,0 +1,452 @@
+import type { BN } from '@project-serum/anchor';
+import {
+  createMemoInstruction,
+  TransactionEnvelope
+} from '@saberhq/solana-contrib';
+import { getOrCreateATA, TOKEN_PROGRAM_ID } from '@saberhq/token-utils';
+import type { TransactionInstruction } from '@solana/web3.js';
+import {
+  PublicKey,
+  SystemProgram,
+  SYSVAR_INSTRUCTIONS_PUBKEY
+} from '@solana/web3.js';
+import invariant from 'tiny-invariant';
+
+import { HONEY_DAO_ADDRESSES } from '../../constants';
+import type {
+  EscrowV2Data,
+  LockedVoterProgram,
+  LockerV2Data,
+  LockerParamsV2,
+  ProposalData
+} from '../../programs';
+import type { TribecaSDK } from '../../sdk';
+import type { VoteSide } from '../govern/types';
+import { GovernorWrapper } from '../govern/governor';
+import { findWhitelistAddress } from '.';
+import { findEscrowAddress } from './pda';
+
+/**
+ * Helper methods around a Locked Voter electorate.
+ */
+export class LockerWrapper {
+  readonly program: LockedVoterProgram;
+  readonly governor: GovernorWrapper;
+
+  private _lockerData: LockerV2Data | null = null;
+
+  constructor(
+    readonly sdk: TribecaSDK,
+    readonly locker: PublicKey,
+    readonly governorKey: PublicKey
+  ) {
+    this.program = sdk.programs.LockedVoter;
+    this.governor = new GovernorWrapper(sdk, governorKey);
+  }
+
+  static async load(
+    sdk: TribecaSDK,
+    lockerKey: PublicKey,
+    governorKey: PublicKey
+  ): Promise<LockerWrapper> {
+    const wrapper = new LockerWrapper(sdk, lockerKey, governorKey);
+    await wrapper.data();
+    return wrapper;
+  }
+
+  /**
+   * Fetches the data of the locker.
+   * @returns
+   */
+  async reload(): Promise<LockerV2Data> {
+    return this.program.account.lockerV2.fetch(this.locker);
+  }
+
+  async fetchProposalData(proposalKey: PublicKey): Promise<ProposalData> {
+    return await this.sdk.govern.program.account.proposal.fetch(proposalKey);
+  }
+
+  async fetchEscrow(escrowKey: PublicKey): Promise<EscrowV2Data> {
+    return await this.program.account.escrowV2.fetch(escrowKey);
+  }
+
+  async fetchEscrowByAuthority(
+    authority: PublicKey = this.sdk.provider.wallet.publicKey
+  ): Promise<EscrowV2Data> {
+    const [escrowKey] = await findEscrowAddress(this.locker, authority);
+    return this.fetchEscrow(escrowKey);
+  }
+
+  /**
+   * Fetches the data of the locker.
+   * @returns
+   */
+  async data(): Promise<LockerV2Data> {
+    if (!this._lockerData) {
+      this._lockerData = await this.reload();
+    }
+    return this._lockerData;
+  }
+
+  async getOrCreateEscrow(
+    authority: PublicKey = this.sdk.provider.wallet.publicKey
+  ): Promise<{
+    escrow: PublicKey;
+    instruction: TransactionInstruction | null;
+  }> {
+    const [escrow] = await findEscrowAddress(this.locker, authority);
+    const escrowData = await this.program.account.escrowV2.fetchNullable(
+      escrow
+    );
+    if (escrowData) {
+      return { escrow: escrow, instruction: null };
+    } else {
+      return {
+        escrow: escrow,
+        instruction: await this.newEscrowIX(authority)
+      };
+    }
+  }
+
+  /**
+   * Creates the instruction to build a new Escrow.
+   * @param authority
+   * @returns
+   */
+  async newEscrowIX(
+    authority: PublicKey = this.sdk.provider.wallet.publicKey
+  ): Promise<TransactionInstruction> {
+    const [escrow] = await findEscrowAddress(this.locker, authority);
+    return this.program.instruction.initEscrowV2({
+      accounts: {
+        locker: this.locker,
+        escrow,
+        escrowOwner: authority,
+        payer: this.sdk.provider.wallet.publicKey,
+        systemProgram: SystemProgram.programId
+      }
+    });
+  }
+
+  async activateProposal({
+    proposal,
+    authority = this.sdk.provider.wallet.publicKey
+  }: {
+    proposal: PublicKey;
+    authority?: PublicKey;
+  }): Promise<TransactionEnvelope> {
+    const [escrow] = await findEscrowAddress(this.locker, authority);
+    const ix = this.program.instruction.activateProposal({
+      accounts: {
+        locker: this.locker,
+        governor: this.governorKey,
+        proposal,
+        escrow,
+        escrowOwner: authority,
+        governProgram: HONEY_DAO_ADDRESSES.Govern
+      }
+    });
+    return new TransactionEnvelope(this.sdk.provider, [ix]);
+  }
+
+  async lockTokensV2({
+    amount,
+    duration,
+    authority = this.sdk.provider.wallet.publicKey
+  }: {
+    amount: BN;
+    duration: BN;
+    authority?: PublicKey;
+  }): Promise<TransactionEnvelope> {
+    invariant(this.locker, 'locker not set');
+
+    const { escrow, instruction: initEscrowIx } = await this.getOrCreateEscrow(
+      authority
+    );
+    const { govTokenAccount, govTokenVault, instructions } =
+      await this._getOrCreateGovTokenATAsInternal(authority, escrow);
+    if (initEscrowIx) {
+      instructions.push(initEscrowIx);
+    }
+
+    const lockerData = await this.reload();
+
+    instructions.push(
+      this.program.instruction.lockV2(amount, duration, {
+        accounts: {
+          locker: this.locker,
+          escrow: escrow,
+          escrowOwner: authority,
+          lockedTokens: govTokenVault,
+          sourceTokens: govTokenAccount,
+          sourceTokensAuthority: authority,
+          tokenProgram: TOKEN_PROGRAM_ID
+        },
+        remainingAccounts: lockerData.params.whitelistEnabled
+          ? [
+              {
+                pubkey: SYSVAR_INSTRUCTIONS_PUBKEY,
+                isSigner: false,
+                isWritable: false
+              },
+              {
+                pubkey: PublicKey.default,
+                isSigner: false,
+                isWritable: false
+              }
+            ]
+          : []
+      })
+    );
+
+    return new TransactionEnvelope(this.sdk.provider, instructions);
+  }
+
+  // async lockTokens({
+  //   amount,
+  //   duration,
+  //   authority = this.sdk.provider.wallet.publicKey
+  // }: {
+  //   amount: BN;
+  //   duration: BN;
+  //   authority?: PublicKey;
+  // }): Promise<TransactionEnvelope> {
+  //   invariant(this.locker, 'locker not set');
+
+  //   const { escrow, instruction: initEscrowIx } = await this.getOrCreateEscrow(
+  //     authority
+  //   );
+  //   const { govTokenAccount, govTokenVault, instructions } =
+  //     await this._getOrCreateGovTokenATAsInternal(authority, escrow);
+  //   if (initEscrowIx) {
+  //     instructions.push(initEscrowIx);
+  //   }
+
+  //   const lockerData = await this.reload();
+
+  //   const lockAccounts = {
+  //     locker: this.locker,
+  //     escrow: escrow,
+  //     escrowOwner: authority,
+  //     escrowTokens: govTokenVault,
+  //     sourceTokens: govTokenAccount,
+  //     tokenProgram: TOKEN_PROGRAM_ID
+  //   };
+
+  //   if (lockerData.params.whitelistEnabled) {
+  //     instructions.push(
+  //       this.program.instruction.lockWithWhitelist(amount, duration, {
+  //         accounts: {
+  //           lock: lockAccounts,
+  //           instructionsSysvar: SYSVAR_INSTRUCTIONS_PUBKEY
+  //         }
+  //       })
+  //     );
+  //   } else {
+  //     instructions.push(
+  //       this.program.instruction.lockPermissionless(amount, duration, {
+  //         accounts: lockAccounts
+  //       })
+  //     );
+  //   }
+
+  //   return new TransactionEnvelope(this.sdk.provider, instructions);
+  // }
+
+  async exit({
+    authority = this.sdk.provider.wallet.publicKey
+  }: {
+    authority?: PublicKey;
+  }): Promise<TransactionEnvelope> {
+    invariant(this.locker, 'locker not set');
+
+    const [escrow] = await findEscrowAddress(this.locker, authority);
+    const escrowData = await this.fetchEscrow(escrow);
+    const { govTokenAccount, instructions } =
+      await this._getOrCreateGovTokenATAsInternal(authority, escrow);
+    instructions.push(
+      this.program.instruction.exitV2({
+        accounts: {
+          locker: this.locker,
+          escrow,
+          escrowOwner: authority,
+          lockedTokens: escrowData.tokens,
+          destinationTokens: govTokenAccount,
+          payer: this.sdk.provider.wallet.publicKey,
+          tokenProgram: TOKEN_PROGRAM_ID
+        }
+      })
+    );
+
+    return new TransactionEnvelope(this.sdk.provider, instructions);
+  }
+
+  async castVotes({
+    voteSide,
+    proposal,
+    authority = this.sdk.provider.wallet.publicKey,
+    reason
+  }: {
+    voteSide: VoteSide;
+    proposal: PublicKey;
+    authority?: PublicKey;
+    reason?: string;
+  }): Promise<TransactionEnvelope> {
+    const ixs: TransactionInstruction[] = [];
+
+    const { escrow, instruction: escrowIx } = await this.getOrCreateEscrow(
+      authority
+    );
+    if (escrowIx) {
+      ixs.push(escrowIx);
+    }
+
+    const { voteKey, instruction: createVoteIX } =
+      await this.governor.getOrCreateVote({
+        proposal,
+        voter: authority
+      });
+    if (createVoteIX) {
+      ixs.push(createVoteIX);
+    }
+
+    ixs.push(
+      this.program.instruction.castVote(voteSide, {
+        accounts: {
+          locker: this.locker,
+          escrow: escrow,
+          voteDelegate: authority ?? this.sdk.provider.wallet.publicKey,
+          proposal,
+          vote: voteKey,
+          governor: this.governorKey,
+          governProgram: HONEY_DAO_ADDRESSES.Govern
+        }
+      })
+    );
+
+    if (reason?.length) {
+      ixs.push(createMemoInstruction(reason, [authority]));
+    }
+
+    return new TransactionEnvelope(this.sdk.provider, ixs);
+  }
+
+  // async setVoteDelegate(
+  //   newDelegate: PublicKey,
+  //   authority: PublicKey = this.sdk.provider.wallet.publicKey
+  // ): Promise<TransactionEnvelope> {
+  //   const [escrow] = await findEscrowAddress(this.locker, authority);
+
+  //   return new TransactionEnvelope(this.sdk.provider, [
+  //     this.program.instruction.setVoteDelegate(newDelegate, {
+  //       accounts: {
+  //         escrow,
+  //         escrowOwner: authority
+  //       }
+  //     })
+  //   ]);
+  // }
+
+  async createApproveProgramLockPrivilegeIx(
+    programId: PublicKey,
+    owner: PublicKey | null
+  ): Promise<TransactionInstruction> {
+    const [whitelistEntry, bump] = await findWhitelistAddress(
+      this.locker,
+      programId,
+      owner
+    );
+    const lockerData = await this.reload();
+    const governorData = await this.sdk.programs.Govern.account.governor.fetch(
+      lockerData.governor
+    );
+    return this.program.instruction.approveProgramLockPrivilegeV2({
+      accounts: {
+        locker: this.locker,
+        whitelistEntry,
+        governor: lockerData.governor,
+        smartWallet: governorData.smartWallet,
+        executableId: programId,
+        whitelistedOwner: owner ?? SystemProgram.programId,
+        payer: this.sdk.provider.wallet.publicKey,
+        systemProgram: SystemProgram.programId
+      }
+    });
+  }
+
+  async createRevokeProgramLockPrivilegeIx(
+    programId: PublicKey,
+    owner: PublicKey | null
+  ): Promise<TransactionInstruction> {
+    const [whitelistEntry] = await findWhitelistAddress(
+      this.locker,
+      programId,
+      owner
+    );
+    const lockerData = await this.reload();
+    const governorData = await this.sdk.programs.Govern.account.governor.fetch(
+      lockerData.governor
+    );
+    return this.program.instruction.revokeProgramLockPrivilegeV2({
+      accounts: {
+        locker: this.locker,
+        whitelistEntry,
+        governor: lockerData.governor,
+        smartWallet: governorData.smartWallet,
+        payer: this.sdk.provider.wallet.publicKey
+      }
+    });
+  }
+
+  async setLockerParamsIx(
+    args: LockerParamsV2
+  ): Promise<TransactionInstruction> {
+    const lockerData = await this.reload();
+    const governorData = await this.sdk.programs.Govern.account.governor.fetch(
+      lockerData.governor
+    );
+
+    return this.program.instruction.setLockerParamsV2(args, {
+      accounts: {
+        locker: this.locker,
+        governor: lockerData.governor,
+        smartWallet: governorData.smartWallet
+      }
+    });
+  }
+
+  private async _getOrCreateGovTokenATAsInternal(
+    authority: PublicKey,
+    escrow: PublicKey
+  ): Promise<{
+    govTokenAccount: PublicKey;
+    govTokenVault: PublicKey;
+    instructions: TransactionInstruction[];
+  }> {
+    const { provider } = this.sdk;
+    const lockerData = await this.data();
+
+    const { address: govTokenAccount, instruction: ix1 } = await getOrCreateATA(
+      {
+        provider,
+        mint: lockerData.tokenMint,
+        owner: authority,
+        payer: authority
+      }
+    );
+    const { address: govTokenVault, instruction: ix2 } = await getOrCreateATA({
+      provider,
+      mint: lockerData.tokenMint,
+      owner: escrow,
+      payer: authority
+    });
+
+    return {
+      govTokenAccount,
+      govTokenVault,
+      instructions: [ix1, ix2].filter(
+        (ix): ix is TransactionInstruction => !!ix
+      )
+    };
+  }
+}
diff --git a/helpers/dao/wrappers/lockedVoter/pda.ts b/helpers/dao/wrappers/lockedVoter/pda.ts
new file mode 100644
index 00000000..aa761bff
--- /dev/null
+++ b/helpers/dao/wrappers/lockedVoter/pda.ts
@@ -0,0 +1,43 @@
+import { utils } from '@project-serum/anchor';
+import { PublicKey, SystemProgram } from '@solana/web3.js';
+
+import { HONEY_DAO_ADDRESSES } from '../../constants';
+
+export const findLockerAddress = async (
+  base: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [utils.bytes.utf8.encode('Locker'), base.toBuffer()],
+    HONEY_DAO_ADDRESSES.LockedVoter
+  );
+};
+
+export const findEscrowAddress = async (
+  locker: PublicKey,
+  authority: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [
+      utils.bytes.utf8.encode('Escrow'),
+      locker.toBuffer(),
+      authority.toBuffer()
+    ],
+    HONEY_DAO_ADDRESSES.LockedVoter
+  );
+};
+
+export const findWhitelistAddress = async (
+  locker: PublicKey,
+  programId: PublicKey,
+  owner: PublicKey | null
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [
+      utils.bytes.utf8.encode('LockerWhitelistEntry'),
+      locker.toBuffer(),
+      programId.toBuffer(),
+      owner ? owner.toBuffer() : SystemProgram.programId.toBuffer()
+    ],
+    HONEY_DAO_ADDRESSES.LockedVoter
+  );
+};
diff --git a/helpers/dao/wrappers/lockedVoter/setup.ts b/helpers/dao/wrappers/lockedVoter/setup.ts
new file mode 100644
index 00000000..89120f50
--- /dev/null
+++ b/helpers/dao/wrappers/lockedVoter/setup.ts
@@ -0,0 +1,89 @@
+import type { GokiSDK, SmartWalletWrapper } from "@gokiprotocol/client";
+import type { TransactionEnvelope } from "@saberhq/solana-contrib";
+import type { PublicKey } from "@solana/web3.js";
+import { Keypair } from "@solana/web3.js";
+
+import type {
+  GovernanceParameters,
+  GovernorWrapper,
+  LockerParams,
+} from "../..";
+import {
+  DEFAULT_GOVERNANCE_PARAMETERS,
+  DEFAULT_LOCKER_PARAMS,
+} from "../../constants";
+import type { TribecaSDK } from "../../sdk";
+import { createGovernorWithElectorate } from "../govern/setup";
+import { LockerWrapper } from "./locker";
+
+/**
+ * Creates a new Locker.
+ * @returns
+ */
+export const createLocker = async ({
+  sdk,
+  gokiSDK,
+  govTokenMint,
+  owners = [sdk.provider.wallet.publicKey],
+  governanceParameters = DEFAULT_GOVERNANCE_PARAMETERS,
+  lockerParams = DEFAULT_LOCKER_PARAMS,
+  governorBaseKP = Keypair.generate(),
+  lockerBaseKP = Keypair.generate(),
+  smartWalletBaseKP = Keypair.generate(),
+}: {
+  sdk: TribecaSDK;
+  gokiSDK: GokiSDK;
+  govTokenMint: PublicKey;
+  owners?: PublicKey[];
+  governanceParameters?: Partial<GovernanceParameters>;
+  lockerParams?: Partial<LockerParams>;
+  /**
+   * Base of the governor.
+   */
+  governorBaseKP?: Keypair;
+  /**
+   * Base of the governor.
+   */
+  lockerBaseKP?: Keypair;
+  /**
+   * Base of the smart wallet.
+   */
+  smartWalletBaseKP?: Keypair;
+}): Promise<{
+  governorWrapper: GovernorWrapper;
+  smartWalletWrapper: SmartWalletWrapper;
+  lockerWrapper: LockerWrapper;
+  createTXs: {
+    title: string;
+    tx: TransactionEnvelope;
+  }[];
+}> => {
+  const { electorate, ...governor } = await createGovernorWithElectorate({
+    createElectorate: async (governorKey) => {
+      const { locker, tx: tx1 } = await sdk.createLocker({
+        ...lockerParams,
+        baseKP: lockerBaseKP,
+        governor: governorKey,
+        govTokenMint,
+      });
+      return {
+        key: locker,
+        tx: tx1,
+      };
+    },
+    sdk,
+    gokiSDK,
+    owners,
+    governanceParameters,
+    govBaseKP: governorBaseKP,
+    smartWalletBaseKP,
+  });
+  return {
+    ...governor,
+    lockerWrapper: new LockerWrapper(
+      sdk,
+      electorate,
+      governor.governorWrapper.governorKey
+    ),
+  };
+};
diff --git a/helpers/idl/stake.json b/helpers/idl/stake.json
index ec5897ed..5396d09c 100644
--- a/helpers/idl/stake.json
+++ b/helpers/idl/stake.json
@@ -357,6 +357,81 @@
           "type": "i64"
         }
       ]
+    },
+    {
+      "name": "stakeV2",
+      "accounts": [
+        {
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "tokenMint",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "pTokenMint",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "pTokenFrom",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userAuthority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "tokenVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "lockedTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "lockerProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "amount",
+          "type": "u64"
+        },
+        {
+          "name": "duration",
+          "type": "i64"
+        }
+      ]
     }
   ],
   "accounts": [
diff --git a/helpers/parser.ts b/helpers/parser.ts
index bc41e88a..39bf8dc9 100644
--- a/helpers/parser.ts
+++ b/helpers/parser.ts
@@ -1,8 +1,9 @@
 import { GOKI_CODERS } from '@gokiprotocol/client';
 import { makeParserHooks, makeProgramParserHooks } from '@saberhq/sail';
 import { SNAPSHOTS_CODERS } from '@saberhq/snapshots';
+import { HONEY_DAO_CODERS } from './dao';
 
-import { HONEY_DAO_CODERS } from './sdk';
+// import { HONEY_DAO_CODERS } from './sdk';
 
 const parserHooks = makeParserHooks({
   ...HONEY_DAO_CODERS.Govern.accountParsers,
diff --git a/helpers/sdk/constant.ts b/helpers/sdk/constant.ts
index 5cc184c4..2fca2681 100644
--- a/helpers/sdk/constant.ts
+++ b/helpers/sdk/constant.ts
@@ -1,20 +1,15 @@
 import { PublicKey } from '@solana/web3.js';
-import { buildCoderMap } from '@saberhq/anchor-contrib';
-import type { GovernTypes } from '@tribecahq/tribeca-sdk';
-import { GovernJSON } from '@tribecahq/tribeca-sdk';
-import type { LockedVoterTypes } from 'helpers/programs/veHoney';
-import { IDL } from 'helpers/types/ve_honey';
 
 export const HONEY_WADS = 1000000;
 
 export const HONEY_MINT = new PublicKey(
-  'HonyeYAaTPgKUgQpayL914P6VAqbQZPrbkGMETZvW4iN'
+  'Bh7vMfPZkGsQJqUjBBGGfcAj6yQdkL8SoLtK5TCYeJtY'
 );
 
 export const HONEY_DECIMALS = 6;
 
 export const PHONEY_MINT = new PublicKey(
-  'PHnyhLEnsD9SiP9tk9kHHKiCxCTPFnymzPspDqAicMe'
+  '7unYPivFG6cuDGeDVjhbutcjYDcMKPu2mBCnRyJ5Qki2'
 );
 
 export const WHITELIST_ENTRY = new PublicKey(
@@ -23,25 +18,6 @@ export const WHITELIST_ENTRY = new PublicKey(
 
 export const PHONEY_DECIMALS = 6;
 
-// See `Anchor.toml` for all addresses.
-export const HONEY_DAO_ADDRESSES = {
-  Govern: new PublicKey('Govz1VyoyLD5BL6CSCxUJLVLsQHRwjfFj1prNsdNg5Jw'),
-  LockedVoter: new PublicKey(process.env.NEXT_PUBLIC_VOTE_PROGRAM_ID!)
-};
-
-/**
- * Program IDLs.
- */
-export const HONEY_DAO_IDLS = {
-  Govern: GovernJSON,
-  LockedVoter: IDL
-};
-
-export const HONEY_DAO_CODERS = buildCoderMap<{
-  Govern: GovernTypes;
-  LockedVoter: LockedVoterTypes;
-}>(HONEY_DAO_IDLS, HONEY_DAO_ADDRESSES);
-
 export const PROPOSAL_TITLE_MAX_LEN = 140;
 
 export const GOVERNOR_ADDRESS = new PublicKey(
diff --git a/helpers/sdk/gov.ts b/helpers/sdk/gov.ts
index 72643567..38a200aa 100644
--- a/helpers/sdk/gov.ts
+++ b/helpers/sdk/gov.ts
@@ -1,3 +1,4 @@
+import { useMemo } from 'react';
 import type { GOKI_ADDRESSES } from '@gokiprotocol/client';
 import { GokiSDK } from '@gokiprotocol/client';
 import { useNativeAccount } from '@saberhq/sail';
@@ -6,9 +7,8 @@ import type { TokenAmount } from '@saberhq/token-utils';
 import { useConnectedWallet, useConnectionContext } from '@saberhq/use-solana';
 import type { PublicKey } from '@solana/web3.js';
 import { Keypair } from '@solana/web3.js';
-import { TribecaSDK } from '@tribecahq/tribeca-sdk';
-import { useMemo } from 'react';
 import { createContainer } from 'unstated-next';
+import { TribecaSDK } from 'helpers/dao';
 
 export type ProgramKey = keyof typeof GOKI_ADDRESSES;
 
diff --git a/helpers/sdk/index.ts b/helpers/sdk/index.ts
index bc1993f0..8420aaaa 100644
--- a/helpers/sdk/index.ts
+++ b/helpers/sdk/index.ts
@@ -2,3 +2,4 @@ export * from './constant';
 export * from './stake';
 export * from './vehoney';
 export * from './gov';
+export * from './pda';
diff --git a/helpers/sdk/pda.ts b/helpers/sdk/pda.ts
new file mode 100644
index 00000000..cdaa4c65
--- /dev/null
+++ b/helpers/sdk/pda.ts
@@ -0,0 +1,42 @@
+import { utils } from '@project-serum/anchor';
+import { PublicKey, SystemProgram } from '@solana/web3.js';
+import { HONEY_DAO_ADDRESSES } from 'helpers/dao';
+
+export const findLockerAddress = async (
+  base: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [utils.bytes.utf8.encode('Locker'), base.toBuffer()],
+    HONEY_DAO_ADDRESSES.LockedVoter
+  );
+};
+
+export const findEscrowAddress = async (
+  locker: PublicKey,
+  authority: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [
+      utils.bytes.utf8.encode('Escrow'),
+      locker.toBuffer(),
+      authority.toBuffer()
+    ],
+    HONEY_DAO_ADDRESSES.LockedVoter
+  );
+};
+
+export const findWhitelistAddress = async (
+  locker: PublicKey,
+  programId: PublicKey,
+  owner: PublicKey | null
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [
+      utils.bytes.utf8.encode('LockerWhitelistEntry'),
+      locker.toBuffer(),
+      programId.toBuffer(),
+      owner ? owner.toBuffer() : SystemProgram.programId.toBuffer()
+    ],
+    HONEY_DAO_ADDRESSES.LockedVoter
+  );
+};
diff --git a/helpers/sdk/stake.ts b/helpers/sdk/stake.ts
index a6637b99..84edc24d 100644
--- a/helpers/sdk/stake.ts
+++ b/helpers/sdk/stake.ts
@@ -156,7 +156,7 @@ export class StakeClient extends ClientBase<Stake> {
     hasEscrow?: boolean
   ) {
     const preInstructions = !hasEscrow
-      ? [...(await veHoneyClient.createInitializeEscrowIx(locker))]
+      ? [...(await veHoneyClient.createInitializeEscrowV2Ix(locker))]
       : undefined;
 
     const remainingAccounts = whitelistEnabled
@@ -186,7 +186,7 @@ export class StakeClient extends ClientBase<Stake> {
     const lockedTokens = await veHoneyClient.getEscrowLockedTokenPDA(escrow);
     const lockerProgram = veHoneyClient.getProgramId();
 
-    const txSig = await this.program.rpc.stake(
+    const txSig = await this.program.rpc.stakeV2(
       new anchor.BN(amount),
       new anchor.BN(duration),
       {
diff --git a/helpers/sdk/vehoney.ts b/helpers/sdk/vehoney.ts
index 454326e5..3fb68d90 100644
--- a/helpers/sdk/vehoney.ts
+++ b/helpers/sdk/vehoney.ts
@@ -262,7 +262,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
   ) {
     const preInstructions = [];
     if (!hasEscrow) {
-      preInstructions.push(...(await this.createInitializeEscrowIx(locker)));
+      preInstructions.push(...(await this.createInitializeEscrowV2Ix(locker)));
     }
 
     const remainingAccounts = [
diff --git a/helpers/types/govern.ts b/helpers/types/govern.ts
new file mode 100644
index 00000000..d2a45e5b
--- /dev/null
+++ b/helpers/types/govern.ts
@@ -0,0 +1,1719 @@
+import { generateErrorMap } from "@saberhq/anchor-contrib";
+
+export type GovernIDL = {
+  version: "0.5.6";
+  name: "govern";
+  instructions: [
+    {
+      name: "createGovernor";
+      accounts: [
+        {
+          name: "base";
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: "governor";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "smartWallet";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "payer";
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: "systemProgram";
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: "bump";
+          type: "u8";
+        },
+        {
+          name: "electorate";
+          type: "publicKey";
+        },
+        {
+          name: "params";
+          type: {
+            defined: "GovernanceParameters";
+          };
+        }
+      ];
+    },
+    {
+      name: "createProposal";
+      accounts: [
+        {
+          name: "governor";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "proposal";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "proposer";
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: "payer";
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: "systemProgram";
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: "bump";
+          type: "u8";
+        },
+        {
+          name: "instructions";
+          type: {
+            vec: {
+              defined: "ProposalInstruction";
+            };
+          };
+        }
+      ];
+    },
+    {
+      name: "activateProposal";
+      accounts: [
+        {
+          name: "governor";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "proposal";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "electorate";
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: "cancelProposal";
+      accounts: [
+        {
+          name: "governor";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "proposal";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "proposer";
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: "queueProposal";
+      accounts: [
+        {
+          name: "governor";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "proposal";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "transaction";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "smartWallet";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "payer";
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: "smartWalletProgram";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "systemProgram";
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: "txBump";
+          type: "u8";
+        }
+      ];
+    },
+    {
+      name: "newVote";
+      accounts: [
+        {
+          name: "proposal";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "vote";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "payer";
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: "systemProgram";
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: "bump";
+          type: "u8";
+        },
+        {
+          name: "voter";
+          type: "publicKey";
+        }
+      ];
+    },
+    {
+      name: "setVote";
+      accounts: [
+        {
+          name: "governor";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "proposal";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "vote";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "electorate";
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [
+        {
+          name: "side";
+          type: "u8";
+        },
+        {
+          name: "weight";
+          type: "u64";
+        }
+      ];
+    },
+    {
+      name: "setGovernanceParams";
+      accounts: [
+        {
+          name: "governor";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "smartWallet";
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [
+        {
+          name: "params";
+          type: {
+            defined: "GovernanceParameters";
+          };
+        }
+      ];
+    },
+    {
+      name: "setElectorate";
+      accounts: [
+        {
+          name: "governor";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "smartWallet";
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [
+        {
+          name: "newElectorate";
+          type: "publicKey";
+        }
+      ];
+    },
+    {
+      name: "createProposalMeta";
+      accounts: [
+        {
+          name: "proposal";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "proposer";
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: "proposalMeta";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "payer";
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: "systemProgram";
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: "bump";
+          type: "u8";
+        },
+        {
+          name: "title";
+          type: "string";
+        },
+        {
+          name: "descriptionLink";
+          type: "string";
+        }
+      ];
+    }
+  ];
+  accounts: [
+    {
+      name: "Governor";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "base";
+            type: "publicKey";
+          },
+          {
+            name: "bump";
+            type: "u8";
+          },
+          {
+            name: "proposalCount";
+            type: "u64";
+          },
+          {
+            name: "electorate";
+            type: "publicKey";
+          },
+          {
+            name: "smartWallet";
+            type: "publicKey";
+          },
+          {
+            name: "params";
+            type: {
+              defined: "GovernanceParameters";
+            };
+          }
+        ];
+      };
+    },
+    {
+      name: "Proposal";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "governor";
+            type: "publicKey";
+          },
+          {
+            name: "index";
+            type: "u64";
+          },
+          {
+            name: "bump";
+            type: "u8";
+          },
+          {
+            name: "proposer";
+            type: "publicKey";
+          },
+          {
+            name: "quorumVotes";
+            type: "u64";
+          },
+          {
+            name: "forVotes";
+            type: "u64";
+          },
+          {
+            name: "againstVotes";
+            type: "u64";
+          },
+          {
+            name: "abstainVotes";
+            type: "u64";
+          },
+          {
+            name: "canceledAt";
+            type: "i64";
+          },
+          {
+            name: "createdAt";
+            type: "i64";
+          },
+          {
+            name: "activatedAt";
+            type: "i64";
+          },
+          {
+            name: "votingEndsAt";
+            type: "i64";
+          },
+          {
+            name: "queuedAt";
+            type: "i64";
+          },
+          {
+            name: "queuedTransaction";
+            type: "publicKey";
+          },
+          {
+            name: "instructions";
+            type: {
+              vec: {
+                defined: "ProposalInstruction";
+              };
+            };
+          }
+        ];
+      };
+    },
+    {
+      name: "ProposalMeta";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "proposal";
+            type: "publicKey";
+          },
+          {
+            name: "title";
+            type: "string";
+          },
+          {
+            name: "descriptionLink";
+            type: "string";
+          }
+        ];
+      };
+    },
+    {
+      name: "Vote";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "proposal";
+            type: "publicKey";
+          },
+          {
+            name: "voter";
+            type: "publicKey";
+          },
+          {
+            name: "bump";
+            type: "u8";
+          },
+          {
+            name: "side";
+            type: "u8";
+          },
+          {
+            name: "weight";
+            type: "u64";
+          }
+        ];
+      };
+    }
+  ];
+  types: [
+    {
+      name: "GovernanceParameters";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "votingDelay";
+            type: "u64";
+          },
+          {
+            name: "votingPeriod";
+            type: "u64";
+          },
+          {
+            name: "quorumVotes";
+            type: "u64";
+          },
+          {
+            name: "timelockDelaySeconds";
+            type: "i64";
+          }
+        ];
+      };
+    },
+    {
+      name: "ProposalInstruction";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "programId";
+            type: "publicKey";
+          },
+          {
+            name: "keys";
+            type: {
+              vec: {
+                defined: "ProposalAccountMeta";
+              };
+            };
+          },
+          {
+            name: "data";
+            type: "bytes";
+          }
+        ];
+      };
+    },
+    {
+      name: "ProposalAccountMeta";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "pubkey";
+            type: "publicKey";
+          },
+          {
+            name: "isSigner";
+            type: "bool";
+          },
+          {
+            name: "isWritable";
+            type: "bool";
+          }
+        ];
+      };
+    },
+    {
+      name: "ProposalState";
+      type: {
+        kind: "enum";
+        variants: [
+          {
+            name: "Draft";
+          },
+          {
+            name: "Active";
+          },
+          {
+            name: "Canceled";
+          },
+          {
+            name: "Defeated";
+          },
+          {
+            name: "Succeeded";
+          },
+          {
+            name: "Queued";
+          }
+        ];
+      };
+    },
+    {
+      name: "VoteSide";
+      type: {
+        kind: "enum";
+        variants: [
+          {
+            name: "Pending";
+          },
+          {
+            name: "Against";
+          },
+          {
+            name: "For";
+          },
+          {
+            name: "Abstain";
+          }
+        ];
+      };
+    }
+  ];
+  events: [
+    {
+      name: "GovernorCreateEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "electorate";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "smartWallet";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "parameters";
+          type: {
+            defined: "GovernanceParameters";
+          };
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "ProposalCreateEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "proposal";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "index";
+          type: "u64";
+          index: false;
+        },
+        {
+          name: "instructions";
+          type: {
+            vec: {
+              defined: "ProposalInstruction";
+            };
+          };
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "ProposalActivateEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "proposal";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "votingEndsAt";
+          type: "i64";
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "ProposalCancelEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "proposal";
+          type: "publicKey";
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "ProposalQueueEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "proposal";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "transaction";
+          type: "publicKey";
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "VoteSetEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "proposal";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "voter";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "vote";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "side";
+          type: "u8";
+          index: false;
+        },
+        {
+          name: "weight";
+          type: "u64";
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "ProposalMetaCreateEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "proposal";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "title";
+          type: "string";
+          index: false;
+        },
+        {
+          name: "descriptionLink";
+          type: "string";
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "GovernorSetParamsEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "prevParams";
+          type: {
+            defined: "GovernanceParameters";
+          };
+          index: false;
+        },
+        {
+          name: "params";
+          type: {
+            defined: "GovernanceParameters";
+          };
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "GovernorSetElectorateEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "prevElectorate";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "newElectorate";
+          type: "publicKey";
+          index: false;
+        }
+      ];
+    }
+  ];
+  errors: [
+    {
+      code: 6000;
+      name: "InvalidVoteSide";
+      msg: "Invalid vote side.";
+    },
+    {
+      code: 6001;
+      name: "GovernorNotFound";
+      msg: "The owner of the smart wallet doesn't match with current.";
+    },
+    {
+      code: 6002;
+      name: "VotingDelayNotMet";
+      msg: "The proposal cannot be activated since it has not yet passed the voting delay.";
+    },
+    {
+      code: 6003;
+      name: "ProposalNotDraft";
+      msg: "Only drafts can be canceled.";
+    },
+    {
+      code: 6004;
+      name: "ProposalNotActive";
+      msg: "The proposal must be active.";
+    }
+  ];
+};
+export const GovernJSON: GovernIDL = {
+  version: "0.5.6",
+  name: "govern",
+  instructions: [
+    {
+      name: "createGovernor",
+      accounts: [
+        {
+          name: "base",
+          isMut: false,
+          isSigner: true,
+        },
+        {
+          name: "governor",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "smartWallet",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "payer",
+          isMut: true,
+          isSigner: true,
+        },
+        {
+          name: "systemProgram",
+          isMut: false,
+          isSigner: false,
+        },
+      ],
+      args: [
+        {
+          name: "bump",
+          type: "u8",
+        },
+        {
+          name: "electorate",
+          type: "publicKey",
+        },
+        {
+          name: "params",
+          type: {
+            defined: "GovernanceParameters",
+          },
+        },
+      ],
+    },
+    {
+      name: "createProposal",
+      accounts: [
+        {
+          name: "governor",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "proposal",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "proposer",
+          isMut: false,
+          isSigner: true,
+        },
+        {
+          name: "payer",
+          isMut: true,
+          isSigner: true,
+        },
+        {
+          name: "systemProgram",
+          isMut: false,
+          isSigner: false,
+        },
+      ],
+      args: [
+        {
+          name: "bump",
+          type: "u8",
+        },
+        {
+          name: "instructions",
+          type: {
+            vec: {
+              defined: "ProposalInstruction",
+            },
+          },
+        },
+      ],
+    },
+    {
+      name: "activateProposal",
+      accounts: [
+        {
+          name: "governor",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "proposal",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "electorate",
+          isMut: false,
+          isSigner: true,
+        },
+      ],
+      args: [],
+    },
+    {
+      name: "cancelProposal",
+      accounts: [
+        {
+          name: "governor",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "proposal",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "proposer",
+          isMut: false,
+          isSigner: true,
+        },
+      ],
+      args: [],
+    },
+    {
+      name: "queueProposal",
+      accounts: [
+        {
+          name: "governor",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "proposal",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "transaction",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "smartWallet",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "payer",
+          isMut: true,
+          isSigner: true,
+        },
+        {
+          name: "smartWalletProgram",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "systemProgram",
+          isMut: false,
+          isSigner: false,
+        },
+      ],
+      args: [
+        {
+          name: "txBump",
+          type: "u8",
+        },
+      ],
+    },
+    {
+      name: "newVote",
+      accounts: [
+        {
+          name: "proposal",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "vote",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "payer",
+          isMut: true,
+          isSigner: true,
+        },
+        {
+          name: "systemProgram",
+          isMut: false,
+          isSigner: false,
+        },
+      ],
+      args: [
+        {
+          name: "bump",
+          type: "u8",
+        },
+        {
+          name: "voter",
+          type: "publicKey",
+        },
+      ],
+    },
+    {
+      name: "setVote",
+      accounts: [
+        {
+          name: "governor",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "proposal",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "vote",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "electorate",
+          isMut: false,
+          isSigner: true,
+        },
+      ],
+      args: [
+        {
+          name: "side",
+          type: "u8",
+        },
+        {
+          name: "weight",
+          type: "u64",
+        },
+      ],
+    },
+    {
+      name: "setGovernanceParams",
+      accounts: [
+        {
+          name: "governor",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "smartWallet",
+          isMut: false,
+          isSigner: true,
+        },
+      ],
+      args: [
+        {
+          name: "params",
+          type: {
+            defined: "GovernanceParameters",
+          },
+        },
+      ],
+    },
+    {
+      name: "setElectorate",
+      accounts: [
+        {
+          name: "governor",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "smartWallet",
+          isMut: false,
+          isSigner: true,
+        },
+      ],
+      args: [
+        {
+          name: "newElectorate",
+          type: "publicKey",
+        },
+      ],
+    },
+    {
+      name: "createProposalMeta",
+      accounts: [
+        {
+          name: "proposal",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "proposer",
+          isMut: false,
+          isSigner: true,
+        },
+        {
+          name: "proposalMeta",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "payer",
+          isMut: true,
+          isSigner: true,
+        },
+        {
+          name: "systemProgram",
+          isMut: false,
+          isSigner: false,
+        },
+      ],
+      args: [
+        {
+          name: "bump",
+          type: "u8",
+        },
+        {
+          name: "title",
+          type: "string",
+        },
+        {
+          name: "descriptionLink",
+          type: "string",
+        },
+      ],
+    },
+  ],
+  accounts: [
+    {
+      name: "Governor",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "base",
+            type: "publicKey",
+          },
+          {
+            name: "bump",
+            type: "u8",
+          },
+          {
+            name: "proposalCount",
+            type: "u64",
+          },
+          {
+            name: "electorate",
+            type: "publicKey",
+          },
+          {
+            name: "smartWallet",
+            type: "publicKey",
+          },
+          {
+            name: "params",
+            type: {
+              defined: "GovernanceParameters",
+            },
+          },
+        ],
+      },
+    },
+    {
+      name: "Proposal",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "governor",
+            type: "publicKey",
+          },
+          {
+            name: "index",
+            type: "u64",
+          },
+          {
+            name: "bump",
+            type: "u8",
+          },
+          {
+            name: "proposer",
+            type: "publicKey",
+          },
+          {
+            name: "quorumVotes",
+            type: "u64",
+          },
+          {
+            name: "forVotes",
+            type: "u64",
+          },
+          {
+            name: "againstVotes",
+            type: "u64",
+          },
+          {
+            name: "abstainVotes",
+            type: "u64",
+          },
+          {
+            name: "canceledAt",
+            type: "i64",
+          },
+          {
+            name: "createdAt",
+            type: "i64",
+          },
+          {
+            name: "activatedAt",
+            type: "i64",
+          },
+          {
+            name: "votingEndsAt",
+            type: "i64",
+          },
+          {
+            name: "queuedAt",
+            type: "i64",
+          },
+          {
+            name: "queuedTransaction",
+            type: "publicKey",
+          },
+          {
+            name: "instructions",
+            type: {
+              vec: {
+                defined: "ProposalInstruction",
+              },
+            },
+          },
+        ],
+      },
+    },
+    {
+      name: "ProposalMeta",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "proposal",
+            type: "publicKey",
+          },
+          {
+            name: "title",
+            type: "string",
+          },
+          {
+            name: "descriptionLink",
+            type: "string",
+          },
+        ],
+      },
+    },
+    {
+      name: "Vote",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "proposal",
+            type: "publicKey",
+          },
+          {
+            name: "voter",
+            type: "publicKey",
+          },
+          {
+            name: "bump",
+            type: "u8",
+          },
+          {
+            name: "side",
+            type: "u8",
+          },
+          {
+            name: "weight",
+            type: "u64",
+          },
+        ],
+      },
+    },
+  ],
+  types: [
+    {
+      name: "GovernanceParameters",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "votingDelay",
+            type: "u64",
+          },
+          {
+            name: "votingPeriod",
+            type: "u64",
+          },
+          {
+            name: "quorumVotes",
+            type: "u64",
+          },
+          {
+            name: "timelockDelaySeconds",
+            type: "i64",
+          },
+        ],
+      },
+    },
+    {
+      name: "ProposalInstruction",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "programId",
+            type: "publicKey",
+          },
+          {
+            name: "keys",
+            type: {
+              vec: {
+                defined: "ProposalAccountMeta",
+              },
+            },
+          },
+          {
+            name: "data",
+            type: "bytes",
+          },
+        ],
+      },
+    },
+    {
+      name: "ProposalAccountMeta",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "pubkey",
+            type: "publicKey",
+          },
+          {
+            name: "isSigner",
+            type: "bool",
+          },
+          {
+            name: "isWritable",
+            type: "bool",
+          },
+        ],
+      },
+    },
+    {
+      name: "ProposalState",
+      type: {
+        kind: "enum",
+        variants: [
+          {
+            name: "Draft",
+          },
+          {
+            name: "Active",
+          },
+          {
+            name: "Canceled",
+          },
+          {
+            name: "Defeated",
+          },
+          {
+            name: "Succeeded",
+          },
+          {
+            name: "Queued",
+          },
+        ],
+      },
+    },
+    {
+      name: "VoteSide",
+      type: {
+        kind: "enum",
+        variants: [
+          {
+            name: "Pending",
+          },
+          {
+            name: "Against",
+          },
+          {
+            name: "For",
+          },
+          {
+            name: "Abstain",
+          },
+        ],
+      },
+    },
+  ],
+  events: [
+    {
+      name: "GovernorCreateEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "electorate",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "smartWallet",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "parameters",
+          type: {
+            defined: "GovernanceParameters",
+          },
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "ProposalCreateEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "proposal",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "index",
+          type: "u64",
+          index: false,
+        },
+        {
+          name: "instructions",
+          type: {
+            vec: {
+              defined: "ProposalInstruction",
+            },
+          },
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "ProposalActivateEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "proposal",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "votingEndsAt",
+          type: "i64",
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "ProposalCancelEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "proposal",
+          type: "publicKey",
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "ProposalQueueEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "proposal",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "transaction",
+          type: "publicKey",
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "VoteSetEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "proposal",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "voter",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "vote",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "side",
+          type: "u8",
+          index: false,
+        },
+        {
+          name: "weight",
+          type: "u64",
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "ProposalMetaCreateEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "proposal",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "title",
+          type: "string",
+          index: false,
+        },
+        {
+          name: "descriptionLink",
+          type: "string",
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "GovernorSetParamsEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "prevParams",
+          type: {
+            defined: "GovernanceParameters",
+          },
+          index: false,
+        },
+        {
+          name: "params",
+          type: {
+            defined: "GovernanceParameters",
+          },
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "GovernorSetElectorateEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "prevElectorate",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "newElectorate",
+          type: "publicKey",
+          index: false,
+        },
+      ],
+    },
+  ],
+  errors: [
+    {
+      code: 6000,
+      name: "InvalidVoteSide",
+      msg: "Invalid vote side.",
+    },
+    {
+      code: 6001,
+      name: "GovernorNotFound",
+      msg: "The owner of the smart wallet doesn't match with current.",
+    },
+    {
+      code: 6002,
+      name: "VotingDelayNotMet",
+      msg: "The proposal cannot be activated since it has not yet passed the voting delay.",
+    },
+    {
+      code: 6003,
+      name: "ProposalNotDraft",
+      msg: "Only drafts can be canceled.",
+    },
+    {
+      code: 6004,
+      name: "ProposalNotActive",
+      msg: "The proposal must be active.",
+    },
+  ],
+};
+export const GovernErrors = generateErrorMap(GovernJSON);
diff --git a/helpers/types/stake.ts b/helpers/types/stake.ts
index 27947aee..ec03a791 100644
--- a/helpers/types/stake.ts
+++ b/helpers/types/stake.ts
@@ -357,6 +357,81 @@ export type Stake = {
           type: 'i64';
         }
       ];
+    },
+    {
+      name: 'stakeV2';
+      accounts: [
+        {
+          name: 'poolInfo';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'tokenMint';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'pTokenMint';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'pTokenFrom';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'userAuthority';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'tokenVault';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'authority';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'locker';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrow';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'lockedTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'lockerProgram';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'tokenProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: 'amount';
+          type: 'u64';
+        },
+        {
+          name: 'duration';
+          type: 'i64';
+        }
+      ];
     }
   ];
   accounts: [
@@ -847,6 +922,81 @@ export const IDL: Stake = {
           type: 'i64'
         }
       ]
+    },
+    {
+      name: 'stakeV2',
+      accounts: [
+        {
+          name: 'poolInfo',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'tokenMint',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'pTokenMint',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'pTokenFrom',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'userAuthority',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'tokenVault',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'authority',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'locker',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrow',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'lockedTokens',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'lockerProgram',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'tokenProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: [
+        {
+          name: 'amount',
+          type: 'u64'
+        },
+        {
+          name: 'duration',
+          type: 'i64'
+        }
+      ]
     }
   ],
   accounts: [
diff --git a/helpers/utils.ts b/helpers/utils.ts
index e646cc3a..d98d438c 100644
--- a/helpers/utils.ts
+++ b/helpers/utils.ts
@@ -18,7 +18,7 @@ import * as anchor from '@project-serum/anchor';
 import type { Network } from '@saberhq/solana-contrib';
 import type { Cluster, TransactionInstruction } from '@solana/web3.js';
 import { TokenInfo } from '@saberhq/token-utils';
-import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { VoteSide } from 'helpers/dao';
 import { SmartWalletTransactionData } from '@gokiprotocol/client';
 import BN from 'bn.js';
 
diff --git a/hooks/tribeca/useEscrow.ts b/hooks/tribeca/useEscrow.ts
index 0eeb9e6b..2b5c4c8d 100644
--- a/hooks/tribeca/useEscrow.ts
+++ b/hooks/tribeca/useEscrow.ts
@@ -1,9 +1,9 @@
 import { TokenAmount } from '@saberhq/token-utils';
 import { useSolana } from '@saberhq/use-solana';
 import type { PublicKey } from '@solana/web3.js';
-import { findEscrowAddress, VoteEscrow } from '@tribecahq/tribeca-sdk';
+import { VoteEscrow } from 'helpers/dao';
 import { useEscrowData, useLockerData } from 'helpers/parser';
-import { useSDK } from 'helpers/sdk';
+import { findEscrowAddress, useSDK } from 'helpers/sdk';
 import { useEffect } from 'react';
 import { useQuery } from 'react-query';
 import invariant from 'tiny-invariant';
@@ -38,14 +38,10 @@ export const useEscrow = (owner?: PublicKey) => {
     }
   );
 
-  const {
-    data: escrow,
-    isLoading: isEscrowLoading,
-    ...rest
-  } = useEscrowData(escrowKey);
+  const { data: escrow, isLoading: isEscrowLoading } = useEscrowData(escrowKey);
   const canLoadEscrow =
     !!governorData && !!(lockerKey && owner && tribecaMut && escrow);
-  console.log(canLoadEscrow, rest);
+
   const result = useQuery(
     ['escrow', escrow?.publicKey.toString()],
     async () => {
diff --git a/hooks/tribeca/useGovernor.ts b/hooks/tribeca/useGovernor.ts
index 304e13ef..2c93994f 100644
--- a/hooks/tribeca/useGovernor.ts
+++ b/hooks/tribeca/useGovernor.ts
@@ -1,7 +1,7 @@
-import { useAccountData, usePubkey, useToken } from '@saberhq/sail';
+import { useAccountData, useToken } from '@saberhq/sail';
 import { Token, TokenAmount } from '@saberhq/token-utils';
 import type { PublicKey } from '@solana/web3.js';
-import { GovernorWrapper } from '@tribecahq/tribeca-sdk';
+import { GovernorWrapper } from 'helpers/dao';
 import { useMemo } from 'react';
 import { createContainer } from 'unstated-next';
 
diff --git a/hooks/tribeca/useProposals.ts b/hooks/tribeca/useProposals.ts
index e7f54c13..2c8dd25a 100644
--- a/hooks/tribeca/useProposals.ts
+++ b/hooks/tribeca/useProposals.ts
@@ -3,13 +3,13 @@ import { getCacheKeyOfPublicKey } from '@saberhq/sail';
 import { u64 } from '@saberhq/token-utils';
 import { useSolana } from '@saberhq/use-solana';
 import type { PublicKey } from '@solana/web3.js';
-import type { ProposalData, ProposalMetaData } from '@tribecahq/tribeca-sdk';
+import type { ProposalData, ProposalMetaData } from 'helpers/dao';
 import {
   findProposalAddress,
   findProposalMetaAddress,
   getProposalState,
   ProposalState
-} from '@tribecahq/tribeca-sdk';
+} from 'helpers/dao';
 import BN from 'bn.js';
 import { useEffect, useMemo } from 'react';
 import { useQueries, useQuery } from 'react-query';
diff --git a/hooks/tribeca/useVote.ts b/hooks/tribeca/useVote.ts
index 62b22641..f6f16e57 100644
--- a/hooks/tribeca/useVote.ts
+++ b/hooks/tribeca/useVote.ts
@@ -1,6 +1,6 @@
 import { useSolana } from '@saberhq/use-solana';
 import type { PublicKey } from '@solana/web3.js';
-import { findVoteAddress } from '@tribecahq/tribeca-sdk';
+import { findVoteAddress } from 'helpers/dao';
 import { useQuery } from 'react-query';
 import invariant from 'tiny-invariant';
 
diff --git a/hooks/useParsedInstruction.ts b/hooks/useParsedInstruction.ts
index 447b957a..6f702656 100644
--- a/hooks/useParsedInstruction.ts
+++ b/hooks/useParsedInstruction.ts
@@ -5,7 +5,7 @@ import type {
   IdlAccountItem
 } from '@project-serum/anchor/dist/cjs/idl';
 import type { PublicKey, TransactionInstruction } from '@solana/web3.js';
-import type { ProposalInstruction } from '@tribecahq/tribeca-sdk';
+import type { ProposalInstruction } from 'helpers/dao';
 import { startCase } from 'lodash';
 import { useMemo } from 'react';
 
diff --git a/icons/PulsingDot.tsx b/icons/PulsingDot.tsx
index fd46feaf..d281dee7 100644
--- a/icons/PulsingDot.tsx
+++ b/icons/PulsingDot.tsx
@@ -1,8 +1,8 @@
 export const PulsingDot = (props: { color: string }) => (
   <svg
-    width="200"
-    height="200"
-    viewBox="0 0 40 40"
+    width="44"
+    height="44"
+    viewBox="0 0 44 44"
     xmlns="http://www.w3.org/2000/svg"
   >
     <circle
diff --git a/package.json b/package.json
index 5f44e3b7..25e8dec6 100644
--- a/package.json
+++ b/package.json
@@ -26,10 +26,10 @@
     "@nfteyez/sol-rayz-react": "^0.10.2",
     "@octokit/plugin-rest-endpoint-methods": "^5.13.0",
     "@project-serum/anchor": "^0.24.2",
-    "@saberhq/anchor-contrib": "^1.13.1",
+    "@saberhq/anchor-contrib": "^1.12.69",
     "@saberhq/sail": "3.4.4",
     "@saberhq/snapshots": "^0.2.8",
-    "@saberhq/solana-contrib": "^1.13.1",
+    "@saberhq/solana-contrib": "^1.12.69",
     "@saberhq/token-utils": "^1.12.48",
     "@saberhq/use-solana": "^1.12.48",
     "@solana/spl-token": "0.1.8",
@@ -71,5 +71,9 @@
     "eslint-plugin-unicorn": "^41.0.0",
     "prettier": "^2.5.1",
     "typescript": "4.6.2"
+  },
+  "resolutions": {
+    "jsbi": "^4",
+    "@saberhq/solana-contrib": "^1.12.69"
   }
 }
diff --git a/pages/_app.tsx b/pages/_app.tsx
index fa8e7f9f..a015910f 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -75,7 +75,13 @@ function MyApp({ Component, pageProps }: AppProps) {
           }}
           networkConfigs={networkConfiguration()}
         >
-          <SailProvider>
+          <SailProvider
+            initialState={{
+              onSailError: err => {
+                console.log(err);
+              }
+            }}
+          >
             <SDKProvider>
               <GovernorProvider
                 initialState={{
diff --git a/yarn.lock b/yarn.lock
index 8b9aa96a..2ebeafdf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -817,12 +817,12 @@
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz#782fa5da44c4f38ae9fd38e9184b54e451936118"
   integrity sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg==
 
-"@saberhq/anchor-contrib@^1.13.1":
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/@saberhq/anchor-contrib/-/anchor-contrib-1.13.1.tgz#457385ce4533363b983c1ff97251dff2e94259e1"
-  integrity sha512-ZiZAqiQLTpFU43zQfLyoEkJjt+0LW5ZSm63wqc7xm0hKOw/ronMkNOslqXbNqIp2rRRg8GzOFgid4TAEWqzuOw==
+"@saberhq/anchor-contrib@^1.12.69":
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/@saberhq/anchor-contrib/-/anchor-contrib-1.13.6.tgz#56e427b3a991dc79a34dddd592a671a29a7f3e53"
+  integrity sha512-WS08qptCZEXWr1pD1mz3bktb8O2/jEze6PaLIUK2rxKHjcLSVPeA5Pmxstsmb7djq8K7TMciZlPkLYSawZrlsQ==
   dependencies:
-    "@saberhq/solana-contrib" "^1.13.1"
+    "@saberhq/solana-contrib" "^1.13.6"
     eventemitter3 "^4.0.7"
     lodash.camelcase "^4.3.0"
     lodash.mapvalues "^4.6.0"
@@ -855,22 +855,10 @@
     tiny-invariant "^1.2.0"
     tslib "^2.3.1"
 
-"@saberhq/solana-contrib@^1.12.56":
-  version "1.12.56"
-  resolved "https://registry.yarnpkg.com/@saberhq/solana-contrib/-/solana-contrib-1.12.56.tgz#0472ba6960d9993c37808697d7afff5b63e11b14"
-  integrity sha512-b6Szv+XqJE9pFqQ6QfQluRyvQIXAdmLk/KrZ2Ks/XtQVMX2ZxdBf5mGozGNa8NzuzgeOzj/BQ8akbAazfll5dw==
-  dependencies:
-    "@types/promise-retry" "^1.1.3"
-    "@types/retry" "^0.12.1"
-    promise-retry "^2.0.1"
-    retry "^0.13.1"
-    tiny-invariant "^1.2.0"
-    tslib "^2.3.1"
-
-"@saberhq/solana-contrib@^1.13.1":
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/@saberhq/solana-contrib/-/solana-contrib-1.13.1.tgz#b1b583c13ea80d191736947d27b25ca5dd59fd77"
-  integrity sha512-2hWKZS8bhH1QXVzkf0OoMDdNDc/POCUUbKQEGwZBv+ri/9GUkfihYm6TPgVecmqa6PM1qMtUDGqrC529Pi/4mQ==
+"@saberhq/solana-contrib@^1.12.56", "@saberhq/solana-contrib@^1.12.69", "@saberhq/solana-contrib@^1.13.6":
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/@saberhq/solana-contrib/-/solana-contrib-1.13.6.tgz#6a221eab85afc49d08d8bfabc098b2a6f401f45c"
+  integrity sha512-gDZoFJoHU1q8WtWDkNYBxIukaLga4836DMxlFmFt+4ZWXQB1foUm/XX5G12keYJFk2T0SpaQ80uybGy+5gVGxw==
   dependencies:
     "@solana/buffer-layout" "^4.0.0"
     "@types/promise-retry" "^1.1.3"
@@ -1324,7 +1312,7 @@
   resolved "https://registry.yarnpkg.com/@types/resize-observer-browser/-/resize-observer-browser-0.1.7.tgz#294aaadf24ac6580b8fbd1fe3ab7b59fe85f9ef3"
   integrity sha512-G9eN0Sn0ii9PWQ3Vl72jDPgeJwRWhv2Qk/nQkJuWmRmOB4HX3/BhD5SE1dZs/hzPZL/WKnvF0RHdTSG54QJFyg==
 
-"@types/retry@*", "@types/retry@^0.12.1":
+"@types/retry@*":
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
   integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
@@ -4164,6 +4152,11 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+jsbi@^4:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741"
+  integrity sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==
+
 jsbi@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.2.0.tgz#975567e0dd47fdf91bad4b5a681070d15e244b68"

From c2a2bcebcca4fdc253320e4a37b1261204208f66 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Thu, 19 May 2022 13:03:40 -0500
Subject: [PATCH 026/101] Fix build error

---
 helpers/dao/wrappers/govern/governor.ts   | 74 +++++++++++------------
 helpers/dao/wrappers/lockedVoter/setup.ts | 36 +++++------
 package.json                              |  2 +-
 yarn.lock                                 |  7 +--
 4 files changed, 57 insertions(+), 62 deletions(-)

diff --git a/helpers/dao/wrappers/govern/governor.ts b/helpers/dao/wrappers/govern/governor.ts
index 6cc3ac25..4a986f7c 100644
--- a/helpers/dao/wrappers/govern/governor.ts
+++ b/helpers/dao/wrappers/govern/governor.ts
@@ -1,28 +1,28 @@
 import {
   findTransactionAddress,
   GOKI_ADDRESSES,
-  GOKI_CODERS,
-} from "@gokiprotocol/client";
-import { TransactionEnvelope } from "@saberhq/solana-contrib";
-import { u64 } from "@saberhq/token-utils";
-import type { PublicKey, TransactionInstruction } from "@solana/web3.js";
-import { SystemProgram } from "@solana/web3.js";
-import type BN from "bn.js";
+  GOKI_CODERS
+} from '@gokiprotocol/client';
+import { TransactionEnvelope } from '@saberhq/solana-contrib';
+import { u64 } from '@saberhq/token-utils';
+import type { PublicKey, TransactionInstruction } from '@solana/web3.js';
+import { SystemProgram } from '@solana/web3.js';
+import { PendingProposal } from '@tribecahq/tribeca-sdk';
+import type BN from 'bn.js';
 
 import type {
   GovernanceParameters,
   GovernorData,
   ProposalData,
   ProposalInstruction,
-  ProposalMetaData,
-} from "../../programs/govern";
-import type { TribecaSDK } from "../../sdk";
-import type { PendingProposal } from "../simpleVoter/types";
+  ProposalMetaData
+} from '../../programs/govern';
+import type { TribecaSDK } from '../../sdk';
 import {
   findProposalAddress,
   findProposalMetaAddress,
-  findVoteAddress,
-} from "./pda";
+  findVoteAddress
+} from './pda';
 
 /**
  * Wrapper around a Governor.
@@ -80,7 +80,7 @@ export class GovernorWrapper {
     proposal,
     proposer = this.sdk.provider.wallet.publicKey,
     title,
-    descriptionLink,
+    descriptionLink
   }: {
     proposal: PublicKey;
     proposer?: PublicKey;
@@ -98,8 +98,8 @@ export class GovernorWrapper {
           proposer,
           proposalMeta: proposalMetaKey,
           payer: this.provider.wallet.publicKey,
-          systemProgram: SystemProgram.programId,
-        },
+          systemProgram: SystemProgram.programId
+        }
       }
     );
     return this.provider.newTX([ix]);
@@ -111,7 +111,7 @@ export class GovernorWrapper {
    */
   async createProposal({
     proposer = this.sdk.provider.wallet.publicKey,
-    instructions,
+    instructions
   }: {
     proposer?: PublicKey;
     instructions: ProposalInstruction[];
@@ -131,15 +131,15 @@ export class GovernorWrapper {
           proposal,
           proposer,
           payer: provider.wallet.publicKey,
-          systemProgram: SystemProgram.programId,
-        },
+          systemProgram: SystemProgram.programId
+        }
       })
     );
 
     return {
       proposal,
       index,
-      tx: this.provider.newTX(ixs),
+      tx: this.provider.newTX(ixs)
     };
   }
 
@@ -150,7 +150,7 @@ export class GovernorWrapper {
   async queueProposal({
     index,
     smartWalletProgram = GOKI_ADDRESSES.SmartWallet,
-    payer = this.provider.wallet.publicKey,
+    payer = this.provider.wallet.publicKey
   }: {
     index: BN;
     smartWalletProgram?: PublicKey;
@@ -164,7 +164,7 @@ export class GovernorWrapper {
         governorData.smartWallet
       );
     if (!smartWalletDataRaw) {
-      throw new Error("smart wallet not found");
+      throw new Error('smart wallet not found');
     }
     const smartWalletData = GOKI_CODERS.SmartWallet.accountParsers.smartWallet(
       smartWalletDataRaw.data
@@ -182,9 +182,9 @@ export class GovernorWrapper {
           smartWalletProgram,
           transaction: txKey,
           payer,
-          systemProgram: SystemProgram.programId,
-        },
-      }),
+          systemProgram: SystemProgram.programId
+        }
+      })
     ]);
   }
 
@@ -194,7 +194,7 @@ export class GovernorWrapper {
    */
   cancelProposal({
     proposal,
-    proposer = this.sdk.provider.wallet.publicKey,
+    proposer = this.sdk.provider.wallet.publicKey
   }: {
     proposal: PublicKey;
     proposer?: PublicKey;
@@ -204,16 +204,16 @@ export class GovernorWrapper {
         accounts: {
           governor: this.governorKey,
           proposal,
-          proposer,
-        },
-      }),
+          proposer
+        }
+      })
     ]);
   }
 
   async getOrCreateVote({
     proposal,
     voter = this.sdk.provider.wallet.publicKey,
-    payer = this.sdk.provider.wallet.publicKey,
+    payer = this.sdk.provider.wallet.publicKey
   }: {
     proposal: PublicKey;
     voter?: PublicKey;
@@ -234,8 +234,8 @@ export class GovernorWrapper {
           proposal,
           voteKeyAndBump: [voteKey, bump],
           voter,
-          payer,
-        }),
+          payer
+        })
       };
     }
   }
@@ -244,7 +244,7 @@ export class GovernorWrapper {
     proposal,
     voteKeyAndBump,
     voter = this.sdk.provider.wallet.publicKey,
-    payer = this.sdk.provider.wallet.publicKey,
+    payer = this.sdk.provider.wallet.publicKey
   }: {
     proposal: PublicKey;
     voteKeyAndBump?: [PublicKey, number];
@@ -261,8 +261,8 @@ export class GovernorWrapper {
         vote: voteKey,
         proposal,
         payer,
-        systemProgram: SystemProgram.programId,
-      },
+        systemProgram: SystemProgram.programId
+      }
     });
   }
 
@@ -273,8 +273,8 @@ export class GovernorWrapper {
     return this.program.instruction.setGovernanceParams(newParams, {
       accounts: {
         governor: this.governorKey,
-        smartWallet,
-      },
+        smartWallet
+      }
     });
   }
 }
diff --git a/helpers/dao/wrappers/lockedVoter/setup.ts b/helpers/dao/wrappers/lockedVoter/setup.ts
index 89120f50..ead1ad59 100644
--- a/helpers/dao/wrappers/lockedVoter/setup.ts
+++ b/helpers/dao/wrappers/lockedVoter/setup.ts
@@ -1,20 +1,20 @@
-import type { GokiSDK, SmartWalletWrapper } from "@gokiprotocol/client";
-import type { TransactionEnvelope } from "@saberhq/solana-contrib";
-import type { PublicKey } from "@solana/web3.js";
-import { Keypair } from "@solana/web3.js";
+import type { GokiSDK, SmartWalletWrapper } from '@gokiprotocol/client';
+import type { TransactionEnvelope } from '@saberhq/solana-contrib';
+import type { PublicKey } from '@solana/web3.js';
+import { Keypair } from '@solana/web3.js';
 
 import type {
   GovernanceParameters,
   GovernorWrapper,
-  LockerParams,
-} from "../..";
+  LockerParamsV2
+} from '../..';
 import {
   DEFAULT_GOVERNANCE_PARAMETERS,
-  DEFAULT_LOCKER_PARAMS,
-} from "../../constants";
-import type { TribecaSDK } from "../../sdk";
-import { createGovernorWithElectorate } from "../govern/setup";
-import { LockerWrapper } from "./locker";
+  DEFAULT_LOCKER_PARAMS
+} from '../../constants';
+import type { TribecaSDK } from '../../sdk';
+import { createGovernorWithElectorate } from '../govern/setup';
+import { LockerWrapper } from './locker';
 
 /**
  * Creates a new Locker.
@@ -29,14 +29,14 @@ export const createLocker = async ({
   lockerParams = DEFAULT_LOCKER_PARAMS,
   governorBaseKP = Keypair.generate(),
   lockerBaseKP = Keypair.generate(),
-  smartWalletBaseKP = Keypair.generate(),
+  smartWalletBaseKP = Keypair.generate()
 }: {
   sdk: TribecaSDK;
   gokiSDK: GokiSDK;
   govTokenMint: PublicKey;
   owners?: PublicKey[];
   governanceParameters?: Partial<GovernanceParameters>;
-  lockerParams?: Partial<LockerParams>;
+  lockerParams?: Partial<LockerParamsV2>;
   /**
    * Base of the governor.
    */
@@ -59,16 +59,16 @@ export const createLocker = async ({
   }[];
 }> => {
   const { electorate, ...governor } = await createGovernorWithElectorate({
-    createElectorate: async (governorKey) => {
+    createElectorate: async governorKey => {
       const { locker, tx: tx1 } = await sdk.createLocker({
         ...lockerParams,
         baseKP: lockerBaseKP,
         governor: governorKey,
-        govTokenMint,
+        govTokenMint
       });
       return {
         key: locker,
-        tx: tx1,
+        tx: tx1
       };
     },
     sdk,
@@ -76,7 +76,7 @@ export const createLocker = async ({
     owners,
     governanceParameters,
     govBaseKP: governorBaseKP,
-    smartWalletBaseKP,
+    smartWalletBaseKP
   });
   return {
     ...governor,
@@ -84,6 +84,6 @@ export const createLocker = async ({
       sdk,
       electorate,
       governor.governorWrapper.governorKey
-    ),
+    )
   };
 };
diff --git a/package.json b/package.json
index 25e8dec6..a791e36e 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "bn.js": "^5.2.0",
     "date-fns": "^2.28.0",
     "degen": "^0.0.69",
-    "jsbi": "^4.1.0",
+    "jsbi": "^4.3.0",
     "next": "12.1.0",
     "react": "17.0.2",
     "react-countdown": "^2.3.2",
diff --git a/yarn.lock b/yarn.lock
index 2ebeafdf..9eab4cb1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4152,16 +4152,11 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsbi@^4:
+jsbi@^4, jsbi@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741"
   integrity sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==
 
-jsbi@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.2.0.tgz#975567e0dd47fdf91bad4b5a681070d15e244b68"
-  integrity sha512-JzhwPkH7Ra8O1b5uHmWxl6N8ZumqGvMXgpKcsq0/iWlnB+KkzbekCIcLl3hu3sFGTLNXAuXIqY4STtE0ZfT1zA==
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"

From 7c05d267cac1f9c0cf60d1b459d041e39afe619b Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Thu, 19 May 2022 13:32:55 -0500
Subject: [PATCH 027/101] change vote card color

---
 .../locked-voter/CastVoteButton/CastVoteModal.tsx            | 2 +-
 .../Proposals/ProposalIndexView/locked-voter/VotesCard.tsx   | 2 +-
 components/common/governance/Meter.tsx                       | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
index 926cfbf5..5b68b7eb 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
@@ -42,7 +42,7 @@ export const CastVoteModal: React.FC<Props> = ({ proposalInfo }: Props) => {
     const memoIX = createMemoInstruction(reason, [
       escrow.escrowW.provider.wallet.publicKey
     ]);
-    tx.addInstructions(memoIX);
+    tx.append(memoIX);
     const { pending } = await handleTX(tx, `Vote ${VOTE_SIDE_LABEL[side]}`);
     if (!pending) {
       return;
diff --git a/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx b/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
index f711bf3e..efc9fd4f 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
@@ -61,7 +61,7 @@ export const VotesCard: React.FC<Props> = ({ side, proposal }: Props) => {
           <Meter
             value={voteCount ?? new BN(0)}
             max={BN.max(totalDeterminingVotes ?? new BN(0), new BN(1))}
-            barColor="primary"
+            barColor={side === VoteSide.For ? 'primary' : 'red'}
             // barColor={
             //   side === VoteSide.For
             //     ? theme`colors.primary`
diff --git a/components/common/governance/Meter.tsx b/components/common/governance/Meter.tsx
index 76c902e1..8de5703d 100644
--- a/components/common/governance/Meter.tsx
+++ b/components/common/governance/Meter.tsx
@@ -19,11 +19,12 @@ export const Meter: React.FC<Props> = ({
     typeof value === 'number' && typeof max === 'number'
       ? value / max
       : new Fraction(value, max).asNumber;
+
   return (
     <Box
       className={className}
       flexGrow={1}
-      backgroundColor="accent"
+      backgroundColor="accentSecondary"
       height="1"
       borderRadius="full"
     >
@@ -34,7 +35,7 @@ export const Meter: React.FC<Props> = ({
         }}
         height="1"
         borderRadius="full"
-        backgroundColor="backgroundSecondary"
+        backgroundColor="accent"
         // tw="bg-primary h-1 rounded transition-all"
       />
     </Box>

From ec08a8e74b1d649c771fc5a810dc9d745e6fea0b Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Thu, 19 May 2022 14:32:00 -0500
Subject: [PATCH 028/101] Fix minor issues, change styling

---
 .../locked-voter/ProposalCreateInner.tsx      |   2 +-
 .../locked-voter/ProposalTXForm.tsx           |   2 +-
 .../ActiveProposalVotingBars.tsx              |  27 +-
 .../Proposals/ProposalsList/ProposalCard.tsx  |  12 +-
 components/Proposals/ProposalsList/index.tsx  |   8 +-
 components/common/governance/Card.tsx         |   3 +-
 icons/PulsingDot.tsx                          |   2 +-
 pages/governance/index.tsx                    | 422 ++++++++----------
 pages/governance/proposals/index.tsx          |  20 +
 9 files changed, 238 insertions(+), 260 deletions(-)

diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
index 76b3e742..86ad7364 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -184,7 +184,7 @@ export const ProposalCreateInner: React.FC = () => {
         </div>
         <Box display="flex" flexDirection="column" gap="4">
           <Card padding="6">
-            <Heading>Proposal Action</Heading>
+            <Heading level="2">Proposal Action</Heading>
             <Box display="grid" gap="4" paddingX="7" paddingY="6">
               <ProposalTXForm
                 setError={setError}
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
index 59853ad8..2e8dca95 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
@@ -20,7 +20,7 @@ export const ProposalTXForm: React.FC<Props> = ({
   txRaw,
   setTxRaw
 }: Props) => {
-  const [actionType, setActionType] = useState<ActionType>('Upgrade Program');
+  const [actionType, setActionType] = useState<ActionType>('Memo');
   const { smartWallet, lockerData, governor } = useGovernor();
   const { ownerInvokerKey } = useExecutiveCouncil();
 
diff --git a/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx b/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
index 5641a3c0..841778f6 100644
--- a/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
+++ b/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
@@ -4,6 +4,7 @@ import BN from 'bn.js';
 import { useGovernor } from 'hooks/tribeca/useGovernor';
 import type { ProposalInfo } from 'hooks/tribeca/useProposals';
 import { formatNumberSI } from 'helpers/format';
+import { Meter } from 'components/common/governance/Meter';
 // import { Meter } from '../../../../../common/Meter';
 
 interface Props {
@@ -34,15 +35,10 @@ export const ActiveProposalVotingBars: React.FC<Props> = ({
         fontWeight="medium"
         color="white"
       >
-        {/* <div tw="w-full flex items-center gap-3 text-xs text-white font-medium h-6"> */}
-        {/* <Meter
-          value={forVotes}
-          max={maxVotes}
-          barColor={theme`colors.primary`}
-        /> */}
-        {/* <div tw="flex-basis[44px]"> */}
-        {formatNumberSI(forVotes)}
-        {/* </div> */}
+        <Meter value={forVotes} max={maxVotes} barColor={'primary'} />
+        <Box display="flex" flexBasis="12">
+          {formatNumberSI(forVotes)}
+        </Box>
       </Box>
       <Box
         width="full"
@@ -52,15 +48,10 @@ export const ActiveProposalVotingBars: React.FC<Props> = ({
         fontWeight="medium"
         color="white"
       >
-        {/* <div tw="w-full flex items-center gap-3 text-xs text-white font-medium h-6"> */}
-        {/* <Meter
-          value={againstVotes}
-          max={maxVotes}
-          barColor={theme`colors.red.500`}
-        /> */}
-        {/* <div tw="flex-basis[44px]"> */}
-        {formatNumberSI(againstVotes)}
-        {/* </div> */}
+        <Meter value={againstVotes} max={maxVotes} barColor={'red'} />
+        <Box display="flex" flexBasis="12">
+          {formatNumberSI(againstVotes)}
+        </Box>
       </Box>
     </Box>
   );
diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
index 251d7060..ba925300 100644
--- a/components/Proposals/ProposalsList/ProposalCard.tsx
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -37,15 +37,15 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
           display="flex"
           alignItems="center"
           gap="5"
-          width={{ md: '192', xs: '3/4' }}
+          // width={{ md: '192', xs: '3/4' }}
           // tw="flex items-center gap-5 w-3/4 md:w-[500px]"
         >
           {state === ProposalState.Active && (
-            <Box width="11" height="11">
-              <PulsingDot color="decendent" />
+            <Box width="11" height="11" color="accent">
+              <PulsingDot />
             </Box>
           )}
-          <div>
+          <Box>
             <Box display="flex" alignItems="center">
               <Text
                 color="white"
@@ -79,10 +79,10 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
                 </Box>
               </Box>
             )}
-          </div>
+          </Box>
         </Box>
         {state === ProposalState.Active && (
-          <Box width="192">
+          <Box width="1/2">
             <ActiveProposalVotingBars proposal={proposalInfo} />
           </Box>
         )}
diff --git a/components/Proposals/ProposalsList/index.tsx b/components/Proposals/ProposalsList/index.tsx
index 486799e5..eb21b955 100644
--- a/components/Proposals/ProposalsList/index.tsx
+++ b/components/Proposals/ProposalsList/index.tsx
@@ -98,7 +98,7 @@ export const ProposalsList: React.FC<Props> = ({
 
   if (proposalCount === 0 || allProposals.length === 0) {
     return (
-      <div>
+      <Box>
         <EmptyState title="There aren't any proposals yet.">
           <Text>
             <Link href={'/governance/proposals/create'} passHref>
@@ -106,13 +106,13 @@ export const ProposalsList: React.FC<Props> = ({
             </Link>
           </Text>
         </EmptyState>
-      </div>
+      </Box>
     );
   }
 
   const pageCount = calcPageTotal(allProposals.length ?? 0);
   return (
-    <>
+    <Box>
       {allProposals
         .slice(startCursor, startCursor + PROPOSALS_PER_PAGE)
         .map((proposal, i) =>
@@ -132,7 +132,7 @@ export const ProposalsList: React.FC<Props> = ({
           numPages={pageCount}
         />
       )}
-    </>
+    </Box>
   );
 };
 
diff --git a/components/common/governance/Card.tsx b/components/common/governance/Card.tsx
index 7516c03c..c07db0b6 100644
--- a/components/common/governance/Card.tsx
+++ b/components/common/governance/Card.tsx
@@ -36,7 +36,6 @@ export const Card: React.FC<Props> = ({
       display="flex"
       flexDirection="column"
       className={className}
-      // tw="rounded bg-warmGray-850 shadow-xl flex flex-col"
     >
       {title && (
         <Box
@@ -85,6 +84,7 @@ export const Card: React.FC<Props> = ({
               fontSize="small"
               fontWeight="bold"
               textTransform="uppercase"
+              color="white"
               // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800"
             >
               {link.title}
@@ -98,6 +98,7 @@ export const Card: React.FC<Props> = ({
             paddingY="5"
             fontSize="small"
             fontWeight="bold"
+            color="white"
             // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800 text-warmGray-600 cursor-not-allowed"
           >
             {link.title}
diff --git a/icons/PulsingDot.tsx b/icons/PulsingDot.tsx
index d281dee7..9907d84b 100644
--- a/icons/PulsingDot.tsx
+++ b/icons/PulsingDot.tsx
@@ -1,4 +1,4 @@
-export const PulsingDot = (props: { color: string }) => (
+export const PulsingDot = (props: { color?: string }) => (
   <svg
     width="44"
     height="44"
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 5373b8c2..0736b399 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -1,16 +1,5 @@
 import type { NextPage } from 'next';
-import {
-  Box,
-  Button,
-  Card,
-  Heading,
-  IconChevronRight,
-  IconExclamation,
-  Input,
-  Stat,
-  Tag,
-  Text
-} from 'degen';
+import { Box, Button, Card, IconExclamation, Stat, Text } from 'degen';
 import { Stack } from 'degen';
 import Layout from '../../components/Layout/Layout';
 import ModalContainer from 'components/ModalContainer/ModalContainer';
@@ -36,8 +25,8 @@ import {
   convertBnTimestampToDate,
   calcVeHoneyAmount
 } from 'helpers/utils';
-import { HIPS } from 'constants/hip-links';
 import { ProposalsList } from 'components/Proposals/ProposalsList';
+import { Card as ProposalContainer } from 'components/common/governance/Card';
 
 const Governance: NextPage = () => {
   const wallet = useConnectedWallet();
@@ -125,246 +114,223 @@ const Governance: NextPage = () => {
 
   return (
     <Layout>
+      {/* Modals */}
+      <ModalContainer
+        onClose={() => setShowPHoneyModal(false)}
+        isVisible={showPHoneyModal}
+      >
+        <PHoneyModal />
+      </ModalContainer>
+      <ModalContainer
+        onClose={() => setShowVeHoneyModal(false)}
+        isVisible={showVeHoneyModal}
+      >
+        <VeHoneyModal />
+      </ModalContainer>
+      <ModalContainer
+        onClose={() => setShowHoneyModal(false)}
+        isVisible={showHoneyModal}
+      >
+        <HoneyModal />
+      </ModalContainer>
       <Stack space="5" flex={1}>
-        {/* Modals */}
-        <ModalContainer
-          onClose={() => setShowPHoneyModal(false)}
-          isVisible={showPHoneyModal}
-        >
-          <PHoneyModal />
-        </ModalContainer>
-        <ModalContainer
-          onClose={() => setShowVeHoneyModal(false)}
-          isVisible={showVeHoneyModal}
-        >
-          <VeHoneyModal />
-        </ModalContainer>
-        <ModalContainer
-          onClose={() => setShowHoneyModal(false)}
-          isVisible={showHoneyModal}
-        >
-          <HoneyModal />
-        </ModalContainer>
-        {/* Page title */}
-        {/* <Box marginTop="5">
-          <Text variant="extraLarge" weight="bold">
-            Vote on new collateral assets
-          </Text>
-        </Box> */}
-        {/* Cards row */}
-        <Box display="flex" width="full">
-          <Card level="2" padding="6" width="full">
+        <Card level="2" padding="6">
+          <Box
+            display="flex"
+            alignItems="center"
+            flexDirection={{ xs: 'column', md: 'row' }}
+            justifyContent="space-between"
+          >
             <Box
               display="flex"
-              alignItems="center"
               flexDirection={{ xs: 'column', md: 'row' }}
-              justifyContent="space-between"
+              alignItems="center"
             >
-              <Box
-                display="flex"
-                flexDirection={{ xs: 'column', md: 'row' }}
-                alignItems="center"
-              >
-                <IconExclamation color="accent" />
-                <Text variant="small" align="center">
-                  Pre-IDO HONEY (pHONEY) can be converted to HONEY at a 1:1
-                  ratio.{' '}
-                  <Text as="span" color="accent">
-                    You can increase this ratio by locking your tokens
-                  </Text>{' '}
-                  (and receive veHONEY). To participate in governance, you can
-                  lock your HONEY for veHONEY.
-                </Text>
-              </Box>
-              <Stack direction="horizontal" justify="center" align="center">
-                <Button
-                  as="a"
-                  href="https://docs.honey.finance/tokenomics/vehoney"
-                  target="_blank"
-                  size="small"
-                  variant="tertiary"
-                >
-                  Learn more
-                </Button>
-              </Stack>
+              <IconExclamation color="accent" />
+              <Text variant="small" align="center">
+                Pre-IDO HONEY (pHONEY) can be converted to HONEY at a 1:1 ratio.{' '}
+                <Text as="span" color="accent">
+                  You can increase this ratio by locking your tokens
+                </Text>{' '}
+                (and receive veHONEY). To participate in governance, you can
+                lock your HONEY for veHONEY.
+              </Text>
             </Box>
-          </Card>
-        </Box>
+            <Stack direction="horizontal" justify="center" align="center">
+              <Button
+                as="a"
+                href="https://docs.honey.finance/tokenomics/vehoney"
+                target="_blank"
+                size="small"
+                variant="tertiary"
+              >
+                Learn more
+              </Button>
+            </Stack>
+          </Box>
+        </Card>
 
         <Stack
           direction={{
-            lg: 'horizontal',
             md: 'horizontal',
-            sm: 'vertical',
-            xs: 'vertical'
+            sm: 'vertical'
           }}
           space="6"
         >
-          <Box
-            height="full"
-            display="flex"
-            alignItems="stretch"
-            width={{ sm: 'full', md: '1/2' }}
-          >
-            <Card level="2" padding="6" width="full">
-              <Box display="flex" height="full" width="full">
-                <Stack flex={1} justify="space-around">
-                  <Stat
-                    label="Locked"
-                    value={
-                      <NumberFormat
-                        thousandSeparator
-                        value={1000000000}
-                        displayType={'text'}
-                      />
-                    }
-                    size="small"
-                  />
-                  <Stat
-                    label="Total Supply of veHONEY"
-                    value={
-                      <NumberFormat
-                        thousandSeparator
-                        value={1000000000}
-                        displayType={'text'}
-                      />
-                    }
-                    size="small"
-                  />
-                  <Stat
-                    label="Total Supply of HONEY"
-                    value={
-                      <NumberFormat
-                        thousandSeparator
-                        value={1000000000}
-                        displayType={'text'}
-                      />
-                    }
-                    size="small"
-                  />
-                </Stack>
-              </Box>
-            </Card>
-          </Box>
-          <Box
-            height="full"
-            display="flex"
-            alignItems="stretch"
-            style={{ minWidth: '50%' }}
-            width={{ sm: 'full', md: 'fit' }}
-          >
-            <Card width="full" level="2" padding="6">
-              <Box height="full" width="full" display="flex">
-                <Stack
-                  flex={1}
-                  direction={{
-                    lg: 'horizontal',
-                    md: 'horizontal',
-                    sm: 'horizontal',
-                    xs: 'vertical'
-                  }}
-                  space="3"
+          <Card level="2" padding="6" width="full">
+            <Box display="flex" height="full" width="full">
+              <Stack flex={1} justify="space-around">
+                <Stat
+                  label="Locked"
+                  value={
+                    <NumberFormat
+                      thousandSeparator
+                      value={1000000000}
+                      displayType={'text'}
+                    />
+                  }
+                  size="small"
+                />
+                <Stat
+                  label="Total Supply of veHONEY"
+                  value={
+                    <NumberFormat
+                      thousandSeparator
+                      value={1000000000}
+                      displayType={'text'}
+                    />
+                  }
+                  size="small"
+                />
+                <Stat
+                  label="Total Supply of HONEY"
+                  value={
+                    <NumberFormat
+                      thousandSeparator
+                      value={1000000000}
+                      displayType={'text'}
+                    />
+                  }
+                  size="small"
+                />
+              </Stack>
+            </Box>
+          </Card>
+          <Card width="full" level="2" padding="6">
+            <Box height="full" width="full" display="flex">
+              <Stack
+                flex={1}
+                direction={{
+                  lg: 'horizontal',
+                  md: 'horizontal',
+                  sm: 'horizontal',
+                  xs: 'vertical'
+                }}
+                space="3"
+              >
+                <Box
+                  width={{ lg: '3/4', md: '3/4', xs: 'full', sm: 'full' }}
+                  paddingRight={{ xs: '0', sm: '3' }}
+                  paddingBottom={{ xs: '3', sm: '0' }}
+                  borderBottomWidth={{ xs: '0.375', sm: '0' }}
+                  borderRightWidth={{ xs: '0', sm: '0.375' }}
                 >
-                  <Box
-                    width={{ lg: '3/4', md: '3/4', xs: 'full', sm: 'full' }}
-                    paddingRight={{ xs: '0', sm: '3' }}
-                    paddingBottom={{ xs: '3', sm: '0' }}
-                    borderBottomWidth={{ xs: '0.375', sm: '0' }}
-                    borderRightWidth={{ xs: '0', sm: '0.375' }}
-                  >
-                    <Stack flex={1} justify="space-between" space="6">
-                      <Stack justify="space-between" direction="horizontal">
-                        <Stack align="flex-end">
-                          <Text size="small">
-                            <b>{veHoneyAmount}</b> veHONEY balance
-                          </Text>
-                        </Stack>
+                  <Stack flex={1} justify="space-between" space="6">
+                    <Stack justify="space-between" direction="horizontal">
+                      <Stack align="flex-end">
+                        <Text size="small">
+                          <b>{veHoneyAmount}</b> veHONEY balance
+                        </Text>
+                      </Stack>
 
-                        <Stack align="flex-end">
-                          {/* <Text size="small">$HONEY locked</Text> */}
-                          <Text size="small">
-                            <b>{lockedAmount}</b> $HONEY (locked)
-                          </Text>
-                        </Stack>
+                      <Stack align="flex-end">
+                        {/* <Text size="small">$HONEY locked</Text> */}
+                        <Text size="small">
+                          <b>{lockedAmount}</b> $HONEY (locked)
+                        </Text>
                       </Stack>
-                      <Box marginTop="auto">
-                        <Stack space="3">
-                          <Stack justify="space-between" direction="horizontal">
-                            {/* <Text size="small">Lock period starts</Text> */}
-                            {/* <Text size="small">{lockedPeriodStart}</Text> */}
-                          </Stack>
-                          <Stack justify="space-between" direction="horizontal">
-                            <Text size="small">Lock period ends</Text>
-                            <Text size="small">{lockedPeriodEnd}</Text>
-                          </Stack>
-                          <Stack justify="space-between" direction="horizontal">
-                            <Text size="small">pHONEY deposited:</Text>
-                            <Text size="small">{depositedAmount}</Text>
-                          </Stack>
-                          <Stack justify="space-between" direction="horizontal">
-                            <Text size="small">pHONEY balance</Text>
-                            <Text size="small">{pHoneyAmount}</Text>
-                          </Stack>
-                          <Stack justify="space-between" direction="horizontal">
-                            <Text size="small">HONEY balance</Text>
-                            <Text size="small">{honeyAmount}</Text>
-                          </Stack>
-                        </Stack>
-                      </Box>
                     </Stack>
-                  </Box>
-                  <Stack flex={1} justify="space-around">
-                    <Button
-                      onClick={
-                        wallet ? () => setShowPHoneyModal(true) : connect
-                      }
-                      width="full"
-                      size="small"
-                      variant="secondary"
-                    >
-                      pHONEY → HONEY
-                    </Button>
-                    <Button
-                      onClick={
-                        wallet ? () => setShowVeHoneyModal(true) : connect
-                      }
-                      width="full"
-                      size="small"
-                      variant="secondary"
-                    >
-                      pHONEY → veHONEY
-                    </Button>
-                    <Button
-                      onClick={wallet ? () => setShowHoneyModal(true) : connect}
-                      width="full"
-                      size="small"
-                      variant="secondary"
-                    >
-                      HONEY → veHONEY
-                    </Button>
+                    <Box marginTop="auto">
+                      <Stack space="3">
+                        <Stack justify="space-between" direction="horizontal">
+                          {/* <Text size="small">Lock period starts</Text> */}
+                          {/* <Text size="small">{lockedPeriodStart}</Text> */}
+                        </Stack>
+                        <Stack justify="space-between" direction="horizontal">
+                          <Text size="small">Lock period ends</Text>
+                          <Text size="small">{lockedPeriodEnd}</Text>
+                        </Stack>
+                        <Stack justify="space-between" direction="horizontal">
+                          <Text size="small">pHONEY deposited:</Text>
+                          <Text size="small">{depositedAmount}</Text>
+                        </Stack>
+                        <Stack justify="space-between" direction="horizontal">
+                          <Text size="small">pHONEY balance</Text>
+                          <Text size="small">{pHoneyAmount}</Text>
+                        </Stack>
+                        <Stack justify="space-between" direction="horizontal">
+                          <Text size="small">HONEY balance</Text>
+                          <Text size="small">{honeyAmount}</Text>
+                        </Stack>
+                      </Stack>
+                    </Box>
                   </Stack>
+                </Box>
+                <Stack flex={1} justify="space-around">
+                  <Button
+                    onClick={wallet ? () => setShowPHoneyModal(true) : connect}
+                    width="full"
+                    size="small"
+                    variant="secondary"
+                  >
+                    pHONEY → HONEY
+                  </Button>
+                  <Button
+                    onClick={wallet ? () => setShowVeHoneyModal(true) : connect}
+                    width="full"
+                    size="small"
+                    variant="secondary"
+                  >
+                    pHONEY → veHONEY
+                  </Button>
+                  <Button
+                    onClick={wallet ? () => setShowHoneyModal(true) : connect}
+                    width="full"
+                    size="small"
+                    variant="secondary"
+                  >
+                    HONEY → veHONEY
+                  </Button>
                 </Stack>
-              </Box>
-            </Card>
-          </Box>
+              </Stack>
+            </Box>
+          </Card>
         </Stack>
-        {/* HIP cards container */}
         <Box
           flex={1}
-          padding="10"
           borderRadius="2xLarge"
-          backgroundColor="backgroundTertiary"
+          // padding="10"
+          // backgroundColor="backgroundTertiary"
         >
-          <Text
-            weight="semiBold"
-            variant="large"
-            ellipsis
-            lineHeight="none"
-            whiteSpace="pre-wrap"
+          <ProposalContainer
+            title={
+              <Text
+                weight="semiBold"
+                variant="large"
+                ellipsis
+                lineHeight="none"
+                whiteSpace="pre-wrap"
+              >
+                Recent Proposals
+              </Text>
+            }
+            link={{
+              title: 'View All Proposals',
+              href: '/governance/proposals'
+            }}
           >
-            Recent Proposals
-          </Text>
-          <ProposalsList maxCount={3} />
+            <ProposalsList maxCount={3} />
+          </ProposalContainer>
         </Box>
       </Stack>
     </Layout>
diff --git a/pages/governance/proposals/index.tsx b/pages/governance/proposals/index.tsx
index 75d4ec65..7e1f03cc 100644
--- a/pages/governance/proposals/index.tsx
+++ b/pages/governance/proposals/index.tsx
@@ -2,12 +2,32 @@ import { NextPage } from 'next';
 import { useState } from 'react';
 import { ProposalsList } from 'components/Proposals/ProposalsList';
 import Layout from 'components/Layout/Layout';
+import { Button, IconPlus, Stack, Text } from 'degen';
+import SmallToggleSwitch from 'components/SmallToggleSwitch/SmallToggleSwitch';
+import Link from 'next/link';
 
 const Proposals: NextPage = () => {
   const [showDrafts, setShowDrafts] = useState(true);
 
   return (
     <Layout>
+      <Stack align="center" direction="horizontal" justify="space-between">
+        <Stack align="center" direction="horizontal">
+          <Text variant="large">All proposals</Text>
+          <Link href="/governance/proposals/create" passHref>
+            <Button size="small" shape="circle">
+              <IconPlus />
+            </Button>
+          </Link>
+        </Stack>
+        <Stack align="center" direction="horizontal">
+          <SmallToggleSwitch
+            isActive={showDrafts}
+            setIsActive={setShowDrafts}
+          />
+          <Text variant="label">View Drafts</Text>
+        </Stack>
+      </Stack>
       <ProposalsList showDrafts={showDrafts} />
     </Layout>
   );

From 3a02a8e424dc56a3a20feed8dd38a2f6635513a7 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Thu, 19 May 2022 14:53:12 -0500
Subject: [PATCH 029/101] Update token supply value

---
 pages/governance/index.tsx | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 0736b399..2ebf9165 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -27,6 +27,9 @@ import {
 } from 'helpers/utils';
 import { ProposalsList } from 'components/Proposals/ProposalsList';
 import { Card as ProposalContainer } from 'components/common/governance/Card';
+import { useTokenAmount, useTokenMint } from '@saberhq/sail';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { TokenAmount } from '@saberhq/token-utils';
 
 const Governance: NextPage = () => {
   const wallet = useConnectedWallet();
@@ -36,11 +39,30 @@ const Governance: NextPage = () => {
   const [showHoneyModal, setShowHoneyModal] = useState(false);
 
   const { tokenAccounts } = useAccounts();
-
   // ======================== Should replace with configuration ================
   const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
   const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
 
+  const { govToken, veToken, lockedSupply } = useGovernor();
+  const totalVeTokens = useTokenAmount(veToken, '0');
+  const { data: govTokenData } = useTokenMint(govToken?.mintAccount);
+  const totalSupplyFmt =
+    govTokenData && govToken
+      ? new TokenAmount(govToken, govTokenData.account.supply).format({
+          numberFormatOptions: {
+            maximumFractionDigits: 0
+          }
+        })
+      : govTokenData;
+
+  const lockedSupplyFmt = lockedSupply
+    ? lockedSupply.format({
+        numberFormatOptions: {
+          maximumFractionDigits: 0
+        }
+      })
+    : lockedSupply;
+
   const STAKE_POOL_ADDRESS = new PublicKey(
     process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
       'Cv9Hx3VRvqkz5JRPiZM8A2BH31yvpcT4qiUJLdtgu7TE'
@@ -185,7 +207,7 @@ const Governance: NextPage = () => {
                   value={
                     <NumberFormat
                       thousandSeparator
-                      value={1000000000}
+                      value={lockedSupplyFmt}
                       displayType={'text'}
                     />
                   }
@@ -196,7 +218,9 @@ const Governance: NextPage = () => {
                   value={
                     <NumberFormat
                       thousandSeparator
-                      value={1000000000}
+                      value={totalVeTokens?.asNumber.toLocaleString(undefined, {
+                        maximumFractionDigits: 0
+                      })}
                       displayType={'text'}
                     />
                   }
@@ -207,7 +231,7 @@ const Governance: NextPage = () => {
                   value={
                     <NumberFormat
                       thousandSeparator
-                      value={1000000000}
+                      value={totalSupplyFmt?.toString()}
                       displayType={'text'}
                     />
                   }

From 2fe56fc8ae2eb27373261b89b99672ebfa0b8453 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Fri, 20 May 2022 10:21:47 -0500
Subject: [PATCH 030/101] Fix build error

---
 .../ExecuteProposalButton.tsx                 | 134 ++++++++++++++++++
 .../ExecutiveCouncilTab/PendingTXs.tsx        |  50 +++++++
 .../ExecutiveCouncilTab/index.tsx             |  18 +++
 .../locked-voter/actions/ProposalExecute.tsx  |  35 ++---
 components/common/AsyncButton.tsx             |  50 +++++++
 components/common/AsyncConfirmButton.tsx      |  69 +++++++++
 package.json                                  |   2 +
 yarn.lock                                     |   5 +
 8 files changed, 347 insertions(+), 16 deletions(-)
 create mode 100644 components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
 create mode 100644 components/GovernanceManageView/ExecutiveCouncilTab/PendingTXs.tsx
 create mode 100644 components/GovernanceManageView/ExecutiveCouncilTab/index.tsx
 create mode 100644 components/common/AsyncButton.tsx
 create mode 100644 components/common/AsyncConfirmButton.tsx

diff --git a/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx b/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
new file mode 100644
index 00000000..26b8f583
--- /dev/null
+++ b/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
@@ -0,0 +1,134 @@
+import type { SmartWalletTransactionData } from '@gokiprotocol/client';
+import { mapSome, useTXHandlers } from '@saberhq/sail';
+import { tsToDate } from '@saberhq/solana-contrib';
+import type { ProgramAccount } from '@saberhq/token-utils';
+import pluralize from 'pluralize';
+import Countdown from 'react-countdown';
+import invariant from 'tiny-invariant';
+
+import { useSDK } from 'helpers/sdk';
+import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { AsyncConfirmButton } from 'components/common/AsyncConfirmButton';
+// import { ProseSmall } from '../../../../../common/typography/Prose';
+import { EmbedTX } from 'components/Proposals/ProposalIndexView/locked-voter/EmbedTX';
+import { Box, Text } from 'degen';
+
+interface Props {
+  tx: ProgramAccount<SmartWalletTransactionData>;
+  onActivate?: () => void;
+}
+
+export const ExecuteProposalButton: React.FC<Props> = ({
+  tx,
+  onActivate
+}: Props) => {
+  const { governorW, smartWallet } = useGovernor();
+  const { ecWallet } = useExecutiveCouncil();
+  const { sdkMut } = useSDK();
+  const { signAndConfirmTX } = useTXHandlers();
+
+  const eta = tsToDate(tx.account.eta);
+  const gracePeriodEnd = mapSome(ecWallet.data, d =>
+    !tx.account.eta.isNeg()
+      ? tsToDate(tx.account.eta.add(d.account.gracePeriod))
+      : null
+  );
+
+  const etaSurpassed = eta <= new Date();
+  const gracePeriodSurpassed = !!mapSome(gracePeriodEnd, g => g <= new Date());
+
+  const disabledReason = !governorW
+    ? 'No governor'
+    : !ecWallet.data
+    ? 'No EC wallet'
+    : !etaSurpassed
+    ? 'ETA not surpassed'
+    : gracePeriodSurpassed
+    ? 'Grace period surpassed'
+    : null;
+
+  return (
+    <AsyncConfirmButton
+      modal={{
+        title: 'Execute Proposal',
+        // style: tw`max-w-4xl`,
+        contents: (
+          <Box>
+            {/* <ProseSmall tw="text-center"> */}
+            <Text as="p">
+              You are about to execute the following{' '}
+              {pluralize('instruction', tx.account.instructions.length)} on
+              behalf of the DAO:
+            </Text>
+            {/* </ProseSmall> */}
+            <Box width="full" overflow="scroll">
+              <EmbedTX txKey={tx.publicKey} />
+            </Box>
+            <Box textAlign="center">
+              <Text as="p">
+                There will be two instructions for you to sign: the first is to
+                approve the proposal for execution by the smart wallet, and the
+                second is to execute the transaction on behalf of the smart
+                wallet.
+              </Text>
+            </Box>
+          </Box>
+        )
+      }}
+      disabled={
+        !governorW ||
+        !ecWallet.data ||
+        !etaSurpassed ||
+        gracePeriodSurpassed ||
+        !!disabledReason
+      }
+      // tw="w-3/4"
+      variant="primary"
+      onClick={async () => {
+        invariant(governorW && sdkMut && smartWallet && ecWallet.data);
+        const sw = await sdkMut.loadSmartWallet(ecWallet.data.publicKey);
+        const [invoker] = await sw.findOwnerInvokerAddress(0);
+        const invokeTX = await sw.ownerInvokeInstructionV2({
+          instruction: sdkMut.programs.SmartWallet.instruction.approve({
+            accounts: {
+              smartWallet: smartWallet,
+              transaction: tx.publicKey,
+              owner: invoker
+            }
+          }),
+          index: 0
+        });
+        await signAndConfirmTX(invokeTX, 'Approve Proposal');
+
+        const executeTX = await (
+          await sdkMut.loadSmartWallet(smartWallet)
+        ).executeTransaction({
+          transactionKey: tx.publicKey,
+          owner: invoker
+        });
+        const executeIX = executeTX.instructions[0];
+        invariant(executeIX, 'executed');
+        const executeInvoke = await sw.ownerInvokeInstructionV2({
+          instruction: executeIX,
+          index: 0
+        });
+
+        await signAndConfirmTX(executeInvoke, 'Execute Proposal');
+        onActivate?.();
+      }}
+    >
+      {disabledReason ??
+        (!etaSurpassed ? (
+          <>
+            <Box marginRight="1">
+              <Text as="span">ETA in</Text>
+            </Box>
+            <Countdown date={eta} />
+          </>
+        ) : (
+          'Execute Proposal'
+        ))}
+    </AsyncConfirmButton>
+  );
+};
diff --git a/components/GovernanceManageView/ExecutiveCouncilTab/PendingTXs.tsx b/components/GovernanceManageView/ExecutiveCouncilTab/PendingTXs.tsx
new file mode 100644
index 00000000..c8e2819a
--- /dev/null
+++ b/components/GovernanceManageView/ExecutiveCouncilTab/PendingTXs.tsx
@@ -0,0 +1,50 @@
+import { mapSome } from '@saberhq/sail';
+import { tsToDate } from '@saberhq/solana-contrib';
+import { Box } from 'degen';
+
+import { useSmartWallet } from 'hooks/useSmartWallet';
+// import { TableCardBody } from "../../../../../common/card/TableCardBody";
+// import { EmptyState } from "../../../../../common/EmptyState";
+// import { LoadingPage } from "../../../../../common/LoadingPage";
+import { ExecuteProposalButton } from './ExecuteProposalButton';
+
+export const PendingTXs: React.FC = () => {
+  const { parsedTXs, smartWalletData } = useSmartWallet();
+
+  const pendingTXs = parsedTXs?.filter(tx => {
+    if (!tx.tx) {
+      return false;
+    }
+    const gracePeriodEnd = mapSome(tx.tx, t =>
+      mapSome(smartWalletData, d =>
+        !t.account.eta.isNeg()
+          ? tsToDate(t.account.eta.add(d.account.gracePeriod))
+          : null
+      )
+    );
+    if (gracePeriodEnd && gracePeriodEnd <= new Date()) {
+      return false;
+    }
+    return tx.tx?.account.executedAt.isNeg() ?? false;
+  });
+
+  return (
+    <Box width="full">
+      <table>
+        {pendingTXs?.map(tx => (
+          <tr key={tx.tx.publicKey.toString()}>
+            <td>TX-{tx.tx.account.index.toNumber()}</td>
+            <td>{tx.instructions.map(ix => ix.title).join(', ')}</td>
+            <td>
+              <ExecuteProposalButton tx={tx.tx} />
+            </td>
+          </tr>
+        ))}
+      </table>
+      {/* {pendingTXs?.length === 0 && (
+        <EmptyState title="No pending transactions found." />
+      )}
+      {pendingTXs === undefined && <LoadingPage />} */}
+    </Box>
+  );
+};
diff --git a/components/GovernanceManageView/ExecutiveCouncilTab/index.tsx b/components/GovernanceManageView/ExecutiveCouncilTab/index.tsx
new file mode 100644
index 00000000..c5765d8c
--- /dev/null
+++ b/components/GovernanceManageView/ExecutiveCouncilTab/index.tsx
@@ -0,0 +1,18 @@
+import { Box } from 'degen';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { SmartWalletProvider } from 'hooks/useSmartWallet';
+import { Card } from 'components/common/governance/Card';
+import { PendingTXs } from './PendingTXs';
+
+export const ExecutiveCouncilTab: React.FC = () => {
+  const { smartWallet } = useGovernor();
+  return (
+    <SmartWalletProvider initialState={smartWallet ?? undefined}>
+      <Box display="flex" flexDirection="column" gap="4">
+        <Card title="Pending Transactions">
+          <PendingTXs />
+        </Card>
+      </Box>
+    </SmartWalletProvider>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
index f3997069..7d1c8a28 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
@@ -1,21 +1,22 @@
+import Link from 'next/link';
 import { mapSome, useTXHandlers } from '@saberhq/sail';
-// import pluralize from 'pluralize';
+import { Box, Button, Text } from 'degen';
 import Countdown from 'react-countdown';
+// import invariant from 'tiny-invariant';
+// import pluralize from 'pluralize';
 
-// import { useSDK } from 'helpers/sdk';
+import { useSDK } from 'helpers/sdk';
 import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
-// import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
 import type { ProposalInfo } from 'hooks/tribeca/useProposals';
 import { useGokiTransactionData } from 'helpers/parser';
-import { tsToDate } from 'helpers/utils';
+import { gokiTXLink, tsToDate } from 'helpers/utils';
 // import { AsyncConfirmButton } from '../../../../../../common/AsyncConfirmButton';
 // import { Card } from '../../../../../../common/governance/Card';
 // import { ExternalLink } from '../../../../../../common/typography/ExternalLink';
 // import { ProseSmall } from '../../../../../../common/typography/Prose';
-// import { ExecuteProposalButton } from '../../../../GovernanceManageView/tabs/ExecutiveCouncilTab/ExecuteProposalButton';
+import { ExecuteProposalButton } from 'components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton';
 import { Card } from 'components/common/governance/Card';
-import { Box, Text } from 'degen';
-import Link from 'next/link';
 
 interface Props {
   proposal: ProposalInfo;
@@ -26,9 +27,9 @@ export const ProposalExecute: React.FC<Props> = ({
   proposal,
   onActivate
 }: Props) => {
-  // const { governorW, smartWallet } = useGovernor();
+  const { sdkMut } = useSDK();
+  const { governorW, smartWallet } = useGovernor();
   // const emergencyDAO = manifest?.addresses?.['emergency-dao']?.address;
-  // const { sdkMut } = useSDK();
   const { ecWallet, isMemberOfEC } = useExecutiveCouncil();
   const { data: gokiTransactionData } = useGokiTransactionData(
     proposal.proposalData.queuedTransaction
@@ -89,18 +90,20 @@ export const ProposalExecute: React.FC<Props> = ({
             <Countdown date={eta} />.
           </Text>
         )}
-        {/* <ExternalLink tw="mb-4" href={gokiTXLink(gokiTransactionData.account)}>
-          View on Goki
-        </ExternalLink> */}
+        <Box marginBottom="4">
+          <Link href={gokiTXLink(gokiTransactionData.account)} passHref>
+            <Button variant="transparent">View on Goki</Button>
+          </Link>
+        </Box>
         {/* </ProseSmall> */}
-        {/* {isMemberOfEC && (
+        {isMemberOfEC && (
           <Box
             display="flex"
             justifyContent="space-between"
             alignItems="center"
             marginBottom="8"
           >
-            {gracePeriodSurpassed && emergencyDAO && (
+            {/* {gracePeriodSurpassed && (
               <AsyncConfirmButton
                 modal={{
                   title: 'Revive Proposal via Emergency DAO',
@@ -161,13 +164,13 @@ export const ProposalExecute: React.FC<Props> = ({
                   'Revive Proposal via Emergency DAO'
                 )}
               </AsyncConfirmButton>
-            )}
+            )} */}
             <ExecuteProposalButton
               tx={gokiTransactionData}
               onActivate={onActivate}
             />
           </Box>
-        )} */}
+        )}
       </Box>
     </Card>
   );
diff --git a/components/common/AsyncButton.tsx b/components/common/AsyncButton.tsx
new file mode 100644
index 00000000..c724f0e6
--- /dev/null
+++ b/components/common/AsyncButton.tsx
@@ -0,0 +1,50 @@
+import type { GokiSDK } from '@gokiprotocol/client';
+import { useWalletKit } from '@gokiprotocol/walletkit';
+import { Button } from 'degen';
+import { Props as ButtonProps } from 'degen/dist/types/components/Button';
+
+import { useSDK } from 'helpers/sdk';
+
+interface Props extends Omit<ButtonProps, 'onClick'> {
+  onClick?: (sdkMut: GokiSDK) => Promise<void> | void;
+  connectWalletOverride?: string;
+}
+
+export const AsyncButton: React.FC<Props> = ({
+  onClick,
+  children,
+  connectWalletOverride,
+  tone,
+  ...rest
+}: Props) => {
+  const { connect } = useWalletKit();
+  const { sdkMut } = useSDK();
+  return sdkMut !== null ? (
+    <Button
+      size="small"
+      variant="primary"
+      width="full"
+      onClick={
+        onClick
+          ? async () => {
+              await onClick(sdkMut);
+            }
+          : undefined
+      }
+      {...rest}
+    >
+      {children}
+    </Button>
+  ) : (
+    <Button
+      size="small"
+      variant="tertiary"
+      width="full"
+      {...rest}
+      disabled={false}
+      onClick={() => connect()}
+    >
+      {connectWalletOverride ?? 'Connect Wallet'}
+    </Button>
+  );
+};
diff --git a/components/common/AsyncConfirmButton.tsx b/components/common/AsyncConfirmButton.tsx
new file mode 100644
index 00000000..aa603faf
--- /dev/null
+++ b/components/common/AsyncConfirmButton.tsx
@@ -0,0 +1,69 @@
+import type { Interpolation, Theme } from '@emotion/react';
+import { useState } from 'react';
+
+import { AsyncButton } from './AsyncButton';
+import { Modal } from '../Modal';
+import { Box } from 'degen';
+
+type Props = React.ComponentProps<typeof AsyncButton> & {
+  modal: {
+    title: string;
+    disabled?: boolean;
+    contents: React.ReactNode;
+    style?: Interpolation<Theme>;
+    innerStyles?: Interpolation<Theme>;
+  };
+};
+
+export const AsyncConfirmButton: React.FC<Props> = ({
+  children,
+  onClick,
+  modal: { title, contents, disabled, style: modalStyle, innerStyles },
+  ...buttonProps
+}: Props) => {
+  const [showModal, setShowModal] = useState<boolean>(false);
+  return (
+    <>
+      <Modal
+        isOpen={showModal}
+        onDismiss={() => {
+          setShowModal(false);
+        }}
+        // css={modalStyle}
+      >
+        <Box
+          borderBottomWidth="px"
+          borderColor="black"
+          color="white"
+          fontSize="base"
+          fontWeight="bold"
+          textAlign="center"
+          paddingY="4"
+        >
+          {title}
+        </Box>
+        <Box
+          padding="8"
+          display="flex"
+          flexDirection="column"
+          alignItems="center"
+        >
+          {contents}
+          <Box marginTop="8" width="full">
+            <AsyncButton {...buttonProps} disabled={disabled} onClick={onClick}>
+              {title}
+            </AsyncButton>
+          </Box>
+        </Box>
+      </Modal>
+      <AsyncButton
+        {...buttonProps}
+        onClick={() => {
+          setShowModal(true);
+        }}
+      >
+        {children}
+      </AsyncButton>
+    </>
+  );
+};
diff --git a/package.json b/package.json
index a791e36e..7867c274 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "degen": "^0.0.69",
     "jsbi": "^4.3.0",
     "next": "12.1.0",
+    "pluralize": "^8.0.0",
     "react": "17.0.2",
     "react-countdown": "^2.3.2",
     "react-dom": "17.0.2",
@@ -57,6 +58,7 @@
   },
   "devDependencies": {
     "@types/node": "17.0.21",
+    "@types/pluralize": "^0.0.29",
     "@types/react": "17.0.39",
     "eslint": "^8.10.0",
     "eslint-config-next": "12.1.0",
diff --git a/yarn.lock b/yarn.lock
index 9eab4cb1..fccd657e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1262,6 +1262,11 @@
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
+"@types/pluralize@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/pluralize/-/pluralize-0.0.29.tgz#6ffa33ed1fc8813c469b859681d09707eb40d03c"
+  integrity sha512-BYOID+l2Aco2nBik+iYS4SZX0Lf20KPILP5RGmM1IgzdwNdTs0eebiFriOPcej1sX9mLnSoiNte5zcFxssgpGA==
+
 "@types/promise-retry@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@types/promise-retry/-/promise-retry-1.1.3.tgz#baab427419da9088a1d2f21bf56249c21b3dd43c"

From 6d255de529c33987cf318705ce4ad25526669406 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Mon, 23 May 2022 13:06:05 -0500
Subject: [PATCH 031/101] Fix styling

---
 components/AddressLink.tsx                    |  75 +++++
 .../ExecuteProposalButton.tsx                 |   2 +-
 .../EmbedTX/InstructionPreview.tsx            |  13 +-
 .../EmbedTX/InstructionsInner.tsx             |   8 +-
 .../locked-voter/EmbedTX/index.tsx            |   6 +-
 .../locked-voter/ProposalHistory.tsx          |  24 +-
 .../locked-voter/actions/ProposalExecute.tsx  |   8 +-
 .../locked-voter/actions/ProposalQueue.tsx    |   3 +-
 .../Proposals/ProposalsList/ProposalCard.tsx  |  13 +-
 components/common/governance/Card.tsx         |  51 +--
 .../common/program/AddressWithContext.tsx     | 191 +++++++++++
 components/common/program/ProgramLabel.tsx    |  25 ++
 components/common/program/SolAmount.tsx       |  16 +
 components/common/program/sol.tsx             |  30 ++
 .../InstructionDisplay/Box.tsx                |  29 ++
 .../InstructionDisplay/IXAccounts.tsx         |  93 ++++++
 .../InstructionDisplay/IXArguments.tsx        |  49 +++
 .../InstructionDisplay/index.tsx              |  41 +++
 components/tx/TransactionView/context.tsx     | 164 +++++++++
 helpers/error.ts                              | 221 ++++++++++++
 helpers/programError.ts                       | 316 ++++++++++++++++++
 helpers/utils.ts                              |   4 +
 hooks/goki/useSubaccountInfo.ts               |  21 ++
 hooks/useSignaturesForAddress.ts              |  24 ++
 hooks/useTransactions.ts                      |  26 ++
 pages/_app.tsx                                |   9 +-
 26 files changed, 1394 insertions(+), 68 deletions(-)
 create mode 100644 components/AddressLink.tsx
 create mode 100644 components/common/program/AddressWithContext.tsx
 create mode 100644 components/common/program/ProgramLabel.tsx
 create mode 100644 components/common/program/SolAmount.tsx
 create mode 100644 components/common/program/sol.tsx
 create mode 100644 components/tx/TransactionView/TransactionIndexView/InstructionDisplay/Box.tsx
 create mode 100644 components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXAccounts.tsx
 create mode 100644 components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXArguments.tsx
 create mode 100644 components/tx/TransactionView/TransactionIndexView/InstructionDisplay/index.tsx
 create mode 100644 components/tx/TransactionView/context.tsx
 create mode 100644 helpers/error.ts
 create mode 100644 helpers/programError.ts
 create mode 100644 hooks/goki/useSubaccountInfo.ts
 create mode 100644 hooks/useSignaturesForAddress.ts
 create mode 100644 hooks/useTransactions.ts

diff --git a/components/AddressLink.tsx b/components/AddressLink.tsx
new file mode 100644
index 00000000..c3b07b1f
--- /dev/null
+++ b/components/AddressLink.tsx
@@ -0,0 +1,75 @@
+import styled from '@emotion/styled';
+import { useConnectionContext } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+// import copy from 'copy-to-clipboard';
+
+// import { notify } from "../../utils/notifications";
+import { displayAddress, shortenAddress } from 'helpers/utils';
+import { Box, IconDuplicate, Text } from 'degen';
+
+interface Props {
+  address: PublicKey;
+  className?: string;
+  showCopy?: boolean;
+  children?: React.ReactNode;
+  showRaw?: boolean;
+  shorten?: boolean;
+  prefixLinkUrlWithAnchor?: boolean;
+}
+
+export const AddressLink: React.FC<Props> = ({
+  address,
+  className,
+  shorten = true,
+  showCopy = false,
+  showRaw = true,
+  prefixLinkUrlWithAnchor = false,
+  children
+}: Props) => {
+  const { network } = useConnectionContext();
+  const urlPrefix = prefixLinkUrlWithAnchor
+    ? 'https://anchor.so'
+    : 'https://explorer.solana.com';
+  return (
+    <Wrapper alignItems="center">
+      <a
+        className={className}
+        // tw="text-gray-800 dark:text-warmGray-200 hover:text-primary"
+        href={`${urlPrefix}/address/${address.toString()}?cluster=${
+          network?.toString() ?? ''
+        }`}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <Text as="span">
+          {children ??
+            (showRaw
+              ? shorten
+                ? shortenAddress(address.toString())
+                : address.toString()
+              : displayAddress(address.toString(), shorten))}
+        </Text>
+      </a>
+      {showCopy && (
+        <Box
+          marginLeft="1"
+          onClick={e => {
+            e.preventDefault();
+            e.stopPropagation();
+            // copy(address.toString());
+            // notify({ message: 'Copied address to clipboard.' });
+          }}
+        >
+          <CopyIcon />
+        </Box>
+      )}
+    </Wrapper>
+  );
+};
+const Wrapper = styled(Box)`
+  display: inline-flex;
+`;
+
+const CopyIcon = styled(IconDuplicate)`
+  cursor: pointer;
+`;
diff --git a/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx b/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
index 26b8f583..eb2e8278 100644
--- a/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
+++ b/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
@@ -62,7 +62,7 @@ export const ExecuteProposalButton: React.FC<Props> = ({
               behalf of the DAO:
             </Text>
             {/* </ProseSmall> */}
-            <Box width="full" overflow="scroll">
+            <Box width="full">
               <EmbedTX txKey={tx.publicKey} />
             </Box>
             <Box textAlign="center">
diff --git a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx
index f8f06105..b45c020e 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx
@@ -1,11 +1,12 @@
+import { Box, Text } from 'degen';
 import { startCase } from 'lodash';
 
 import { useParsedInstruction } from 'hooks/useParsedInstruction';
 import type { ParsedInstruction } from 'hooks/useSmartWallet';
 import { shortenAddress } from 'helpers/utils';
-// import { AddressLink } from 'components/common/AddressLink';
+import { AddressLink } from 'components/AddressLink';
+import { InstructionDisplay } from 'components/tx/TransactionView/TransactionIndexView/InstructionDisplay';
 // import { InstructionDisplay } from '../../../../../wallet/tx/TransactionView/TransactionIndexView/InstructionDisplay';
-import { Box, Text } from 'degen';
 
 interface Props {
   index: number;
@@ -42,13 +43,13 @@ export const InstructionPreview: React.FC<Props> = ({
           <Text as="span" weight="medium">
             Program:
           </Text>{' '}
-          {/* <AddressLink
-            tw="font-semibold text-secondary"
+          <AddressLink
+            // tw="font-semibold text-secondary"
             address={instruction.ix.programId}
           >
             {instruction.programName} (
             {shortenAddress(instruction.ix.programId.toString())})
-          </AddressLink> */}
+          </AddressLink>
         </Text>
       </Box>
       <Box
@@ -56,7 +57,7 @@ export const InstructionPreview: React.FC<Props> = ({
         borderTopWidth="px"
         // tw="p-4 border-t dark:border-t-warmGray-600"
       >
-        {/* <InstructionDisplay parsed={parsed} instruction={instruction} /> */}
+        <InstructionDisplay parsed={parsed} instruction={instruction} />
       </Box>
     </Box>
   );
diff --git a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx
index 3e5b0be9..85ebf66c 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx
@@ -1,18 +1,18 @@
 import { Box } from 'degen';
-// import { useTransaction } from '../../../../../wallet/tx/TransactionView/context';
+import { useTransaction } from 'components/tx/TransactionView/context';
 import { InstructionPreview } from './InstructionPreview';
 
 export const InstructionsInner: React.FC = () => {
-  // const { instructions } = useTransaction();
+  const { instructions } = useTransaction();
   return (
     <Box display="grid" gap="4">
-      {/* {instructions?.map((instruction, i) => (
+      {instructions?.map((instruction, i) => (
         <InstructionPreview
           key={`ix_${i}`}
           instruction={instruction}
           index={i}
         />
-      ))} */}
+      ))}
     </Box>
   );
 };
diff --git a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx
index c8aa8ae2..7ed01934 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx
@@ -3,7 +3,7 @@ import { Box, Spinner } from 'degen';
 
 import { useParsedTXByKey } from 'hooks/useParsedTX';
 import { SmartWalletProvider } from 'hooks/useSmartWallet';
-// import { TransactionProvider } from '../../../../../wallet/tx/TransactionView/context';
+import { TransactionProvider } from 'components/tx/TransactionView/context';
 import { InstructionsInner } from './InstructionsInner';
 
 interface Props {
@@ -17,9 +17,9 @@ export const EmbedTX: React.FC<Props> = ({ txKey }: Props) => {
       {isLoading && !parsedTX && <Spinner />}
       {parsedTX && (
         <SmartWalletProvider initialState={parsedTX.tx.account.smartWallet}>
-          {/* <TransactionProvider initialState={parsedTX}>
+          <TransactionProvider initialState={parsedTX}>
             <InstructionsInner />
-          </TransactionProvider> */}
+          </TransactionProvider>
         </SmartWalletProvider>
       )}
     </Box>
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
index 658c36de..f6b074f1 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
@@ -8,11 +8,12 @@ import {
 } from 'helpers/dao';
 import BN from 'bn.js';
 import { startCase } from 'lodash';
-import { Box, IconLink, Text } from 'degen';
+import { Box, Button, IconLink, Text } from 'degen';
 
 import type { ProposalInfo } from 'hooks/tribeca/useProposals';
 import { useGokiTransactionData } from 'helpers/parser';
 import { Card } from 'components/common/governance/Card';
+import Link from 'next/link';
 
 const ZERO = new BN(0);
 interface Props {
@@ -114,14 +115,19 @@ export const ProposalHistory: React.FC<Props> = ({
                 </Text>
               </Box>
               {link && (
-                <a
-                  href={link}
-                  // tw="text-primary hover:text-white transition-colors"
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  <IconLink />
-                </a>
+                <Link href={link} passHref>
+                  <Button
+                    href={link}
+                    size="small"
+                    // tone="green"
+                    variant="transparent"
+                    // tw="text-primary hover:text-white transition-colors"
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    <IconLink />
+                  </Button>
+                </Link>
               )}
             </Box>
           </Box>
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
index 7d1c8a28..554b013c 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
@@ -1,6 +1,6 @@
 import Link from 'next/link';
 import { mapSome, useTXHandlers } from '@saberhq/sail';
-import { Box, Button, Text } from 'degen';
+import { Box, Button, IconLink, Text } from 'degen';
 import Countdown from 'react-countdown';
 // import invariant from 'tiny-invariant';
 // import pluralize from 'pluralize';
@@ -90,9 +90,11 @@ export const ProposalExecute: React.FC<Props> = ({
             <Countdown date={eta} />.
           </Text>
         )}
-        <Box marginBottom="4">
+        <Box marginY="4">
           <Link href={gokiTXLink(gokiTransactionData.account)} passHref>
-            <Button variant="transparent">View on Goki</Button>
+            <Button variant="transparent" size="small" suffix={<IconLink />}>
+              View on Goki
+            </Button>
           </Link>
         </Box>
         {/* </ProseSmall> */}
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx
index cd5794c5..b0b7e8de 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx
@@ -33,11 +33,12 @@ export const ProposalQueue: React.FC<Props> = ({
             .
           </Text>
         </Box>
-        <Box display="flex" alignItems="center" justifyContent="space-between">
+        <Box display="flex" alignItems="center" justifyContent="center">
           <Button
             width="3/4"
             disabled={!governorW}
             variant="primary"
+            size="small"
             onClick={async () => {
               invariant(governorW);
               const tx = await governorW.queueProposal({
diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
index ba925300..ad1e299c 100644
--- a/components/Proposals/ProposalsList/ProposalCard.tsx
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -20,18 +20,13 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
   const router = useRouter();
   const { state, executed } = proposalInfo.status;
   return (
-    <Link
-      passHref
-      href={`${router.pathname}/proposals/${proposalInfo.index}`}
-      // tw="flex items-center justify-between py-5 px-6 border-l-2 border-l-transparent border-b border-b-warmGray-800 cursor-pointer hover:border-l-primary"
-    >
+    <Link passHref href={`${router.pathname}/proposals/${proposalInfo.index}`}>
       <Box
         display="flex"
         alignItems="center"
         justifyContent="space-between"
         paddingX="6"
         paddingY="5"
-        // as={Link}
       >
         <Box
           display="flex"
@@ -47,11 +42,7 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
           )}
           <Box>
             <Box display="flex" alignItems="center">
-              <Text
-                color="white"
-                lineHeight="1.375"
-                // tw="text-white leading-snug break-words hyphens[auto]"
-              >
+              <Text color="white" lineHeight="1.375">
                 {proposalInfo.proposalMetaData?.title.slice(
                   0,
                   PROPOSAL_TITLE_MAX_LEN
diff --git a/components/common/governance/Card.tsx b/components/common/governance/Card.tsx
index c07db0b6..899e8eb9 100644
--- a/components/common/governance/Card.tsx
+++ b/components/common/governance/Card.tsx
@@ -1,4 +1,4 @@
-import { Box, Text } from 'degen';
+import { Box, Button, Text } from 'degen';
 import Link from 'next/link';
 
 import { HelperCard } from '../HelperCard';
@@ -69,13 +69,27 @@ export const Card: React.FC<Props> = ({
         {children}
       </Box>
       {/* </ErrorBoundary> */}
-      {link &&
-        (link.href ? (
-          <Box
-            as={Link}
-            href={link.href}
-            color={{ base: 'white', hover: 'textPrimary' }}
-          >
+      {link && (
+        <Box width="full">
+          {link.href ? (
+            <Link href={link.href} passHref>
+              <Button variant="transparent" center width="full">
+                {/* <Box
+                display="flex"
+                alignItems="center"
+                justifyContent="center"
+                paddingY="5"
+                fontSize="small"
+                fontWeight="bold"
+                textTransform="uppercase"
+                color="white"
+                // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800"
+              > */}
+                {link.title}
+                {/* </Box> */}
+              </Button>
+            </Link>
+          ) : (
             <Box
               display="flex"
               alignItems="center"
@@ -83,27 +97,14 @@ export const Card: React.FC<Props> = ({
               paddingY="5"
               fontSize="small"
               fontWeight="bold"
-              textTransform="uppercase"
               color="white"
-              // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800"
+              // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800 text-warmGray-600 cursor-not-allowed"
             >
               {link.title}
             </Box>
-          </Box>
-        ) : (
-          <Box
-            display="flex"
-            alignItems="center"
-            justifyContent="center"
-            paddingY="5"
-            fontSize="small"
-            fontWeight="bold"
-            color="white"
-            // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800 text-warmGray-600 cursor-not-allowed"
-          >
-            {link.title}
-          </Box>
-        ))}
+          )}
+        </Box>
+      )}
     </Box>
   );
 };
diff --git a/components/common/program/AddressWithContext.tsx b/components/common/program/AddressWithContext.tsx
new file mode 100644
index 00000000..8b402cdd
--- /dev/null
+++ b/components/common/program/AddressWithContext.tsx
@@ -0,0 +1,191 @@
+import { ACCOUNT_DISCRIMINATOR_SIZE } from '@project-serum/anchor/dist/cjs/coder';
+import { SuperCoder } from '@saberhq/anchor-contrib';
+import { useAccountData } from '@saberhq/sail';
+import type { KeyedAccountInfo, PublicKey } from '@solana/web3.js';
+import { SystemProgram } from '@solana/web3.js';
+import { startCase } from 'lodash';
+import { useMemo } from 'react';
+import { Spinner, Stack, Text } from 'degen';
+import Link from 'next/link';
+
+import { useSubaccountInfo } from 'hooks/goki/useSubaccountInfo';
+import { useIDL } from 'hooks/useIDLs';
+import { AddressLink } from '../../AddressLink';
+import { ProgramLabel } from './ProgramLabel';
+import { SolAmount } from './SolAmount';
+import { SYSVAR_OWNER } from 'helpers/utils';
+
+type AccountValidator = (account: KeyedAccountInfo) => string | undefined;
+
+export const createFeePayerValidator = (
+  feeLamports: number
+): AccountValidator => {
+  return (account: KeyedAccountInfo): string | undefined => {
+    if (!account.accountInfo.owner.equals(SystemProgram.programId))
+      return 'Only system-owned accounts can pay fees';
+    // TODO: Actually nonce accounts can pay fees too
+    if (account.accountInfo.data.length > 0)
+      return 'Only unallocated accounts can pay fees';
+    if (account.accountInfo.lamports < feeLamports) {
+      return 'Insufficient funds for fees';
+    }
+    return;
+  };
+};
+
+export const programValidator = (
+  account: KeyedAccountInfo
+): string | undefined => {
+  if (!account.accountInfo.executable)
+    return 'Only executable accounts can be invoked';
+  return;
+};
+
+interface Props {
+  className?: string;
+  pubkey: PublicKey;
+  validator?: AccountValidator;
+  prefixLinkUrlWithAnchor?: boolean;
+}
+
+export const AddressWithContext = ({
+  className,
+  pubkey,
+  validator,
+  prefixLinkUrlWithAnchor = false
+}: Props) => {
+  const info = useAccountData(pubkey);
+  return (
+    <Stack>
+      {info.data?.accountInfo.executable ? (
+        <ProgramLabel
+          address={pubkey}
+          showCopy
+          showRaw={false}
+          shorten={false}
+        />
+      ) : (
+        <AddressLink
+          // tw="dark:text-primary hover:text-opacity-80 font-mono"
+          address={pubkey}
+          showCopy
+          showRaw={false}
+          shorten={false}
+          prefixLinkUrlWithAnchor={prefixLinkUrlWithAnchor}
+        />
+      )}
+      <AccountInfo pubkey={pubkey} validator={validator} />
+    </Stack>
+  );
+};
+
+interface Props {
+  pubkey: PublicKey;
+  validator?: AccountValidator;
+}
+
+export const AccountInfo = ({ pubkey, validator }: Props) => {
+  const info = useAccountData(pubkey);
+  const { data: idl } = useIDL(info.data?.accountInfo.owner);
+  const subaccountInfo = useSubaccountInfo(pubkey);
+
+  const accountName = useMemo(() => {
+    if (!idl?.idl || !info.data) {
+      return null;
+    }
+    const discriminator = info.data.accountInfo.data
+      .slice(0, ACCOUNT_DISCRIMINATOR_SIZE)
+      .toString('hex');
+    const sc = new SuperCoder(idl.programID, idl.idl);
+    return sc.discriminators[discriminator] ?? null;
+  }, [idl?.idl, idl?.programID, info.data]);
+
+  if (!info.data) {
+    if (info.loading || subaccountInfo.isLoading) {
+      return (
+        <Text
+          as="span"
+          // tw="text-gray-600 dark:text-gray-300"
+        >
+          <Spinner />
+          {/* <span className="spinner-grow spinner-grow-sm me-2"></span> */}
+          Loading
+        </Text>
+      );
+    } else {
+      if (subaccountInfo.data) {
+        const subaccountData = subaccountInfo.data.account;
+        return (
+          <span>
+            {startCase(Object.keys(subaccountData.subaccountType)[0])} #
+            {subaccountData.index.toString()} of Smart Wallet{' '}
+            <Link
+              // tw="text-primary hover:text-white transition-colors"
+              href={`/address/${subaccountData.smartWallet.toString()}`}
+            >
+              {subaccountData.smartWallet.toString()}
+            </Link>
+            .
+          </span>
+        );
+      }
+      return <span>Account not found</span>;
+    }
+  }
+
+  const errorMessage = validator && validator(info.data);
+  if (errorMessage)
+    return (
+      <Text as="span" color="accent">
+        {errorMessage}
+      </Text>
+    );
+
+  if (info.data.accountInfo.executable) {
+    return (
+      <Text
+        as="span"
+        //  tw="text-gray-600 dark:text-gray-300"
+      >
+        Executable Program
+      </Text>
+    );
+  }
+
+  const owner = info.data.accountInfo.owner;
+
+  return (
+    <Text
+      as="span"
+      //  tw="text-gray-600 dark:text-gray-300"
+    >
+      {owner ? (
+        <>
+          {owner.equals(SYSVAR_OWNER) ? (
+            'Sysvar.'
+          ) : (
+            <>
+              {accountName ? (
+                <>
+                  <Link
+                    // tw="text-primary hover:text-white transition-colors"
+                    href={`/address/${info.data.accountId.toString()}`}
+                  >
+                    {accountName}
+                  </Link>{' '}
+                  o
+                </>
+              ) : (
+                'O'
+              )}
+              wned by <ProgramLabel address={owner} />.
+            </>
+          )}{' '}
+          Balance is <SolAmount lamports={info.data.accountInfo.lamports} />.
+        </>
+      ) : (
+        "Account doesn't exist"
+      )}
+    </Text>
+  );
+};
diff --git a/components/common/program/ProgramLabel.tsx b/components/common/program/ProgramLabel.tsx
new file mode 100644
index 00000000..f2921de9
--- /dev/null
+++ b/components/common/program/ProgramLabel.tsx
@@ -0,0 +1,25 @@
+import { useProgramLabel } from 'hooks/useProgramMeta';
+import { SYSVAR_OWNER } from 'helpers/utils';
+import { AddressLink } from '../../AddressLink';
+
+type Props = React.ComponentProps<typeof AddressLink>;
+
+/**
+ * Renders a program label.
+ * @returns
+ */
+export const ProgramLabel: React.FC<Props> = ({ address, ...rest }: Props) => {
+  const label = useProgramLabel(address);
+  if (address.equals(SYSVAR_OWNER)) {
+    return <>SYSVAR</>;
+  }
+  return (
+    <AddressLink
+      // tw="dark:text-primary hover:text-opacity-80"
+      address={address}
+      {...rest}
+    >
+      {label}
+    </AddressLink>
+  );
+};
diff --git a/components/common/program/SolAmount.tsx b/components/common/program/SolAmount.tsx
new file mode 100644
index 00000000..ef40305a
--- /dev/null
+++ b/components/common/program/SolAmount.tsx
@@ -0,0 +1,16 @@
+import { lamportsToSolString } from "./sol";
+
+interface Props {
+  lamports: number;
+}
+
+const SYMBOL = "◎";
+
+export const SolAmount: React.FC<Props> = ({ lamports }: Props) => {
+  return (
+    <>
+      {SYMBOL}
+      {lamportsToSolString(lamports)}
+    </>
+  );
+};
diff --git a/components/common/program/sol.tsx b/components/common/program/sol.tsx
new file mode 100644
index 00000000..e109ac42
--- /dev/null
+++ b/components/common/program/sol.tsx
@@ -0,0 +1,30 @@
+import { LAMPORTS_PER_SOL } from "@solana/web3.js";
+import type BN from "bn.js";
+
+export function lamportsToSol(lamports: number | BN): number {
+  if (typeof lamports === "number") {
+    return Math.abs(lamports) / LAMPORTS_PER_SOL;
+  }
+
+  let signMultiplier = 1;
+  if (lamports.isNeg()) {
+    signMultiplier = -1;
+  }
+
+  const absLamports = lamports.abs();
+  const lamportsString = absLamports.toString(10).padStart(10, "0");
+  const splitIndex = lamportsString.length - 9;
+  const solString =
+    lamportsString.slice(0, splitIndex) +
+    "." +
+    lamportsString.slice(splitIndex);
+  return signMultiplier * parseFloat(solString);
+}
+
+export function lamportsToSolString(
+  lamports: number | BN,
+  maximumFractionDigits = 9
+): string {
+  const sol = lamportsToSol(lamports);
+  return new Intl.NumberFormat("en-US", { maximumFractionDigits }).format(sol);
+}
diff --git a/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/Box.tsx b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/Box.tsx
new file mode 100644
index 00000000..d3845c85
--- /dev/null
+++ b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/Box.tsx
@@ -0,0 +1,29 @@
+import { Box as DegenBox, Text } from 'degen';
+interface Props {
+  title: string;
+  children?: React.ReactNode;
+  className?: string;
+}
+
+export const Box: React.FC<Props> = ({ title, children, className }: Props) => (
+  <DegenBox borderWidth="px" borderRadius="medium" fontSize="small">
+    <DegenBox paddingX="6" paddingY="2">
+      <Text
+        as="h2"
+        weight="semiBold"
+        // tw="px-6 py-2 font-semibold text-gray-800 dark:text-gray-100"
+      >
+        {title}
+      </Text>
+    </DegenBox>
+    <DegenBox
+      paddingX="6"
+      paddingY="2"
+      borderTopWidth="px"
+      className={className}
+      // tw="px-6 py-2 border-t border-t-gray-150 dark:border-t-warmGray-600"
+    >
+      {children}
+    </DegenBox>
+  </DegenBox>
+);
diff --git a/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXAccounts.tsx b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXAccounts.tsx
new file mode 100644
index 00000000..41cd0c93
--- /dev/null
+++ b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXAccounts.tsx
@@ -0,0 +1,93 @@
+import type { PublicKey } from '@solana/web3.js';
+import { Box as DegenBox, Text } from 'degen';
+
+import { AddressWithContext } from 'components/common/program/AddressWithContext';
+import { Box } from './Box';
+
+interface Props {
+  accounts: {
+    name?: string;
+    pubkey: PublicKey;
+    isSigner: boolean;
+    isWritable: boolean;
+  }[];
+}
+
+export const IXAccounts: React.FC<Props> = ({ accounts }: Props) => {
+  return (
+    <Box title={`Accounts (${accounts.length})`}>
+      <DegenBox whiteSpace="nowrap">
+        {accounts.map((account, i) => {
+          return (
+            <DegenBox
+              paddingX="6"
+              paddingY="2"
+              alignItems="center"
+              justifyContent="space-between"
+              borderTopWidth="px"
+              key={`account_${i}`}
+              // tw="px-6 py-2 flex items-center gap-4 justify-between border-t border-t-gray-150 dark:border-t-warmGray-600"
+            >
+              <DegenBox display="flex" alignItems="center" gap="4">
+                <Text as="span" weight="semiBold">
+                  {account.name ?? `Account #${i}`}
+                </Text>
+                <DegenBox display="flex" alignItems="center" gap="2">
+                  {account.isWritable && (
+                    <DegenBox
+                      borderWidth="px"
+                      paddingX="2"
+                      paddingY="0.5"
+                      borderRadius="full"
+                      fontSize="small"
+                      fontWeight="medium"
+                      alignItems="center"
+                      gap="2"
+                    >
+                      <DegenBox
+                        width="2"
+                        height="2"
+                        backgroundColor="accent"
+                        borderRadius="full"
+                      />
+                      <Text as="span">writable</Text>
+                    </DegenBox>
+                  )}
+                  {account.isSigner && (
+                    <DegenBox
+                      borderWidth="px"
+                      paddingX="2"
+                      paddingY="0.5"
+                      borderRadius="medium"
+                      display="flex"
+                      alignItems="center"
+                      gap="2"
+                    >
+                      <DegenBox
+                        width="2"
+                        height="2"
+                        backgroundColor="accent"
+                        borderRadius="full"
+                      />
+                      <Text as="span">signer</Text>
+                    </DegenBox>
+                  )}
+                </DegenBox>
+              </DegenBox>
+              <DegenBox
+                fontWeight="medium"
+                flexShrink={0}
+                // tw="text-gray-800 font-medium flex-shrink-0"
+              >
+                <AddressWithContext
+                  pubkey={account.pubkey}
+                  prefixLinkUrlWithAnchor
+                />
+              </DegenBox>
+            </DegenBox>
+          );
+        })}
+      </DegenBox>
+    </Box>
+  );
+};
diff --git a/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXArguments.tsx b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXArguments.tsx
new file mode 100644
index 00000000..8f5cf6a4
--- /dev/null
+++ b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXArguments.tsx
@@ -0,0 +1,49 @@
+import { Box as DegenBox, Text } from 'degen';
+import { Box } from './Box';
+
+interface Props {
+  args: { name: string; type: string; data: string }[];
+}
+
+export const IXArguments: React.FC<Props> = ({ args }: Props) => {
+  return (
+    <Box title={`Arguments (${args.length})`}>
+      {args.map((arg, i) => {
+        return (
+          <DegenBox
+            key={`arg_${i}`}
+            // tw="px-6 py-2 flex items-center justify-between border-t border-t-gray-150 dark:border-t-warmGray-600 gap-4"
+            // css={[arg.type.includes('<') && tw`flex-col items-start gap-2`]}
+          >
+            <DegenBox display="flex" gap="4" flexShrink={0}>
+              <Text
+                as="span"
+                weight="semiBold"
+                // tw="text-gray-500 font-semibold"
+              >
+                {arg.name}
+              </Text>
+              <Text
+                as="code"
+                weight="medium"
+                font="mono"
+                // tw="text-gray-500 font-medium font-mono"
+              >
+                {arg.type}
+              </Text>
+            </DegenBox>
+            <DegenBox
+              fontWeight="medium"
+              flexShrink={1}
+              flexWrap="wrap"
+              wordBreak="break-word"
+              //  tw="text-gray-800 dark:text-white font-medium flex-shrink flex-wrap word-break[break-word]"
+            >
+              {arg.data}
+            </DegenBox>
+          </DegenBox>
+        );
+      })}
+    </Box>
+  );
+};
diff --git a/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/index.tsx b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/index.tsx
new file mode 100644
index 00000000..e9eb04f7
--- /dev/null
+++ b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/index.tsx
@@ -0,0 +1,41 @@
+import { Box as DegenBox } from 'degen';
+import type { RichParsedInstruction } from 'hooks/useParsedInstruction';
+import type { ParsedInstruction } from 'hooks/useSmartWallet';
+import { Box } from './Box';
+import { IXAccounts } from './IXAccounts';
+import { IXArguments } from './IXArguments';
+// import { IXData } from './IXData';
+
+interface Props {
+  instruction: ParsedInstruction;
+  parsed: RichParsedInstruction;
+}
+
+export const InstructionDisplay: React.FC<Props> = ({
+  instruction,
+  parsed
+}: Props) => {
+  return (
+    <DegenBox display="grid" gap="4">
+      {/* {parsed.data.type === 'raw' && (
+        <IXData
+          data={Buffer.from(parsed.data.data)}
+          error={
+            instruction.parsed && 'error' in instruction.parsed
+              ? instruction.parsed.error
+              : null
+          }
+        />
+      )} */}
+      {parsed.data.type === 'anchor' && <IXArguments args={parsed.data.args} />}
+      {/* {parsed.data.type === 'object' && (
+        <Box title="Arguments">
+          <AttributeList
+            attributes={parsed.data.args as Record<string, unknown>}
+          />
+        </Box>
+      )} */}
+      <IXAccounts accounts={parsed.accounts} />
+    </DegenBox>
+  );
+};
diff --git a/components/tx/TransactionView/context.tsx b/components/tx/TransactionView/context.tsx
new file mode 100644
index 00000000..8623873c
--- /dev/null
+++ b/components/tx/TransactionView/context.tsx
@@ -0,0 +1,164 @@
+import type {
+  SmartWalletEvents,
+  SmartWalletTransactionData
+} from '@gokiprotocol/client';
+import { SolanaProvider, TransactionEnvelope } from '@saberhq/solana-contrib';
+import type { ProgramAccount } from '@saberhq/token-utils';
+import { useSolana } from '@saberhq/use-solana';
+import type { TransactionResponse } from '@solana/web3.js';
+import { PublicKey } from '@solana/web3.js';
+import { useMemo } from 'react';
+import { createContainer } from 'unstated-next';
+
+import { useSignaturesForAddress } from 'hooks/useSignaturesForAddress';
+import type { ParsedTX } from 'hooks/useSmartWallet';
+import { SMART_WALLET_CODER, useSmartWallet } from 'hooks/useSmartWallet';
+import { useTransactions } from 'hooks/useTransactions';
+import { displayAddress, shortenAddress } from 'helpers/utils';
+
+interface LoadedTransaction extends ParsedTX {
+  tx: ProgramAccount<SmartWalletTransactionData>;
+}
+
+export interface DetailedTransaction extends LoadedTransaction {
+  index: number;
+  id: string;
+  title: string;
+  historicalTXs?: HistoricalTX[];
+  eta: Date | null;
+  executedAt: Date | null;
+  txEnv: TransactionEnvelope | null;
+  state: 'stale' | 'active' | 'approved' | 'executed';
+  numSigned: number;
+}
+
+export interface HistoricalTX extends TransactionResponse {
+  sig: string;
+  date: Date | null | undefined;
+  events: readonly SmartWalletEvent[];
+}
+
+export type SmartWalletEvent = SmartWalletEvents[keyof SmartWalletEvents];
+
+const useTransactionInner = (tx?: LoadedTransaction): DetailedTransaction => {
+  if (!tx) {
+    throw new Error(`missing tx`);
+  }
+  const { smartWalletData } = useSmartWallet();
+  const { provider, providerMut, network } = useSolana();
+  const index = tx.tx.account.index.toNumber();
+
+  const id = `TX-${index}`;
+  const title = `${
+    tx.instructions
+      ?.map(
+        ix =>
+          (ix.parsed && 'name' in ix.parsed
+            ? `${
+                ix.programName ?? displayAddress(ix.ix.programId.toString())
+              }: ${ix.parsed.name.toString()}`
+            : null) ??
+          `Interact with ${
+            ix.programName ?? shortenAddress(ix.ix.programId.toString())
+          }`
+      )
+      .join(', ') ?? 'Unknown Transaction'
+  }`;
+
+  const txData = tx.tx.account;
+
+  const txEnv = useMemo(() => {
+    if (tx.tx.account.instructions.length === 0) {
+      return null;
+    }
+    return new TransactionEnvelope(
+      providerMut ??
+        SolanaProvider.load({
+          connection: provider.connection,
+          sendConnection: provider.connection,
+          wallet: {
+            publicKey:
+              network === 'devnet'
+                ? new PublicKey('A2jaCHPzD6346348JoEym2KFGX9A7uRBw6AhCdX7gTWP')
+                : new PublicKey('9u9iZBWqGsp5hXBxkVZtBTuLSGNAG9gEQLgpuVw39ASg'),
+            signTransaction: () => {
+              throw new Error('unimplemented');
+            },
+            signAllTransactions: () => {
+              throw new Error('unimplemented');
+            }
+          }
+        }),
+      tx.tx.account.instructions.map(ix => ({
+        ...ix,
+        data: Buffer.from(ix.data)
+      }))
+    );
+  }, [network, provider.connection, providerMut, tx.tx.account.instructions]);
+
+  const etaRaw = txData.eta.toNumber();
+  const eta = etaRaw === -1 ? null : new Date(etaRaw * 1_000);
+  const executedAtNum = tx.tx.account.executedAt.toNumber();
+  const executedAt =
+    executedAtNum === -1 ? null : new Date(executedAtNum * 1_000);
+
+  const sigs = useSignaturesForAddress(tx.tx.publicKey);
+  const historicalTXsRaw = useTransactions(
+    sigs.data?.map(s => s.signature) ?? []
+  );
+
+  const historicalTXs = useMemo(() => {
+    return historicalTXsRaw
+      .map(({ data: resp }): HistoricalTX | null => {
+        if (!resp) {
+          return null;
+        }
+        const events = SMART_WALLET_CODER.parseProgramLogEvents(
+          resp.tx.meta?.logMessages ?? []
+        );
+        return {
+          ...resp.tx,
+          events,
+          sig: resp.sig,
+          date:
+            typeof resp.tx.blockTime === 'number'
+              ? new Date(resp.tx.blockTime * 1_000)
+              : resp.tx.blockTime
+        };
+      })
+      .filter((t): t is HistoricalTX => !!t);
+  }, [historicalTXsRaw]);
+
+  const numSigned = ((tx?.tx.account.signers ?? []) as boolean[]).filter(
+    x => !!x
+  ).length;
+
+  const isOwnerSetValid =
+    tx.tx.account.ownerSetSeqno === smartWalletData?.account.ownerSetSeqno;
+  const threshold = smartWalletData
+    ? smartWalletData.account?.threshold.toNumber()
+    : null;
+  const state = executedAt
+    ? 'executed'
+    : !isOwnerSetValid
+    ? 'stale'
+    : typeof threshold === 'number' && numSigned >= threshold
+    ? 'approved'
+    : 'active';
+
+  return {
+    ...tx,
+    id,
+    index,
+    title,
+    historicalTXs,
+    eta,
+    executedAt,
+    txEnv,
+    state,
+    numSigned
+  };
+};
+
+export const { useContainer: useTransaction, Provider: TransactionProvider } =
+  createContainer(useTransactionInner);
diff --git a/helpers/error.ts b/helpers/error.ts
new file mode 100644
index 00000000..cbb47a89
--- /dev/null
+++ b/helpers/error.ts
@@ -0,0 +1,221 @@
+import { GOKI_ADDRESSES, SmartWalletJSON } from '@gokiprotocol/client';
+import {
+  SailError,
+  SailGetMultipleAccountsError,
+  SailTransactionError
+} from '@saberhq/sail';
+import { extractErrorMessage } from '@saberhq/sail';
+import { PublicKey } from '@solana/web3.js';
+import { mapValues } from 'lodash';
+import { toast } from 'react-toastify';
+import { parseIdlErrors, ProgramError } from './programError';
+import { ProgramKey } from './sdk';
+
+const programErrors = mapValues(
+  {
+    SmartWallet: SmartWalletJSON
+  },
+  prog => parseIdlErrors(prog)
+);
+
+const programIDs = Object.entries({
+  ...GOKI_ADDRESSES
+}).reduce(
+  (acc, [name, prog]: [name: string, prog: PublicKey]) => ({
+    ...acc,
+    [prog.toString()]: name
+  }),
+  {}
+) as Record<string, ProgramKey>;
+
+export class CapturedError extends Error {
+  constructor(
+    override readonly name: string,
+    override readonly message: string,
+    readonly source: string,
+    readonly originalError: unknown
+  ) {
+    super(message);
+  }
+}
+
+export const describeRPCError = (msg: string): string => {
+  try {
+    const result = JSON.parse(msg.substring('503 : '.length)) as {
+      error: {
+        code: string;
+        message: string;
+      };
+    };
+    return `${result.error.message} (${result.error.code})`;
+  } catch (e) {
+    // ignore parse error
+  }
+  return msg;
+};
+
+/**
+ * Captures an exception.
+ */
+export const handleException = (
+  err: unknown,
+  {
+    name = err instanceof Error ? err.name : 'CapturedError',
+    source = name ?? 'unspecified',
+    userMessage,
+    groupInSentry
+  }: {
+    /**
+     * Custom name to apply to the error.
+     */
+    name?: string;
+    /**
+     * Source to apply to the error.
+     */
+    source?: string;
+    /**
+     * Notification to send to the user.
+     */
+    userMessage?: {
+      title: string;
+      /**
+       * Defaults to error's message.
+       */
+      description?: string;
+    };
+    /**
+     * If true, applies a fingerprint to group the errors by source and name.
+     */
+    groupInSentry?: boolean;
+    /**
+     * Additional information to be logged and sent to Sentry.
+     */
+  }
+): void => {
+  const captured = new CapturedError(
+    name,
+    extractErrorMessage(err) ?? 'unknown',
+    source,
+    err
+  );
+
+  console.error(`[${captured.name}] (from ${captured.source})`);
+  console.error(captured);
+  console.error(captured.originalError);
+
+  toast.error({
+    message: userMessage?.title ?? name ?? 'Unknown Error',
+    description: userMessage?.description ?? captured.message,
+    type: 'error'
+  });
+};
+
+const onTxError = (error: SailTransactionError) => {
+  // Log the program error
+  const err = error.originalError as Error;
+  const { tx } = error;
+  if (err.toString().includes(': custom program error:')) {
+    // todo: figure out the duplicates
+    if (error.network !== 'localnet') {
+      console.error(`TX`, tx.generateInspectLink(error.network));
+    }
+    const progError = ProgramError.parse(err, tx, programIDs, programErrors);
+    if (progError) {
+      const message = err.message.split(':')[1] ?? 'Transaction failed';
+      toast.error({
+        message,
+        description: `${progError.message}`,
+        env: error.network,
+        type: 'error'
+      });
+      const sentryArgs = {
+        tags: {
+          program: progError.program ?? 'AnchorInternal',
+          'program.error.code': progError.code,
+          'program.error.name': progError.errorName
+        },
+        extra: {
+          progError,
+          message,
+          originalError: err
+        }
+      } as const;
+      console.error(progError, sentryArgs);
+      // Sentry.captureException(progError, sentryArgs);
+      return;
+    }
+  }
+
+  if (/(.+)?: custom program error: 0x1$/.exec(err.message.toString())) {
+    toast.warn({
+      message: `Insufficient SOL (need more SOL)`,
+      description: error.message,
+      env: error.network
+    });
+    return;
+  } else if (err.message.includes('Signature request denied')) {
+    toast.info({
+      message: `Transaction cancelled`,
+      description: error.message,
+      env: error.network,
+      type: 'info'
+    });
+    return;
+  } else {
+    toast.error({
+      message: `Transaction failed (try again later)`,
+      description: error.message,
+      env: error.network,
+      type: 'error'
+    });
+    const { tx } = error;
+    if (error.network !== 'localnet') {
+      console.error(`TX`, tx.generateInspectLink(error.network));
+    }
+  }
+};
+
+const onGetMultipleAccountsError = (
+  err: SailGetMultipleAccountsError
+): void => {
+  handleException(err, {
+    source: 'onGetMultipleAccountsError',
+    userMessage: {
+      title: 'Error fetching data from Solana',
+      description: describeRPCError((err.originalError as Error).message)
+    }
+  });
+  return;
+};
+
+export const onSailError = (err: SailError) => {
+  switch (err.sailErrorName) {
+    case 'SailTransactionError': {
+      onTxError(err as SailTransactionError);
+      return;
+    }
+    case 'SailGetMultipleAccountsError': {
+      onGetMultipleAccountsError(err as SailGetMultipleAccountsError);
+      return;
+    }
+    case 'SailTransactionSignError': {
+      console.log(err.cause);
+      toast.error({
+        message: `Failed to sign transaction.${err.cause}`
+      });
+      return;
+    }
+    case 'SailAccountParseError': {
+      // don't log account parsing errors
+      console.debug('SailAccountParseError', err);
+      return;
+    }
+  }
+  handleException(err, {
+    source: 'sail.unknown',
+    userMessage: {
+      title: err.title,
+      description: err.message
+    }
+  });
+};
diff --git a/helpers/programError.ts b/helpers/programError.ts
new file mode 100644
index 00000000..566380ea
--- /dev/null
+++ b/helpers/programError.ts
@@ -0,0 +1,316 @@
+import type { Idl } from '@project-serum/anchor';
+import type { AnchorError } from '@saberhq/anchor-contrib';
+import type { TransactionEnvelope } from '@saberhq/solana-contrib';
+import {
+  ASSOCIATED_TOKEN_PROGRAM_ID,
+  TOKEN_PROGRAM_ID
+} from '@saberhq/token-utils';
+import type { PublicKey, TransactionInstruction } from '@solana/web3.js';
+
+import type { ProgramKey } from 'helpers/sdk';
+
+export class IdlError extends Error {}
+
+export type KnownProgram = ProgramKey | 'Token' | 'AToken' | 'StableSwap';
+
+export type ProgramErrorRepr = AnchorError<Idl> & {
+  displayMessage: string;
+};
+
+export function parseIdlErrors(idl: Idl): Map<number, ProgramErrorRepr> {
+  const errors = new Map<number, ProgramErrorRepr>();
+  if (idl.errors) {
+    idl.errors.forEach(e => {
+      const msg = e.msg ?? e.name;
+      errors.set(e.code, { ...e, displayMessage: msg });
+    });
+  }
+  return errors;
+}
+
+// An error from a user defined program.
+export class ProgramError extends Error {
+  constructor(
+    readonly errorInfo: ProgramErrorRepr,
+    readonly underlying: string,
+    readonly program?: KnownProgram
+  ) {
+    super(errorInfo.displayMessage);
+    this.name = `${program ?? 'Anchor'}ProgramError`;
+  }
+
+  static parse(
+    err: Error,
+    txEnv: TransactionEnvelope,
+    programIDs: Record<string, ProgramKey>,
+    programErrors: { [K in ProgramKey]?: Map<number, ProgramErrorRepr> },
+    programNameOverride?: ProgramKey
+  ): ProgramError | null {
+    // TODO: don't rely on the error string. web3.js should preserve the error
+    //       code information instead of giving us an untyped string.
+    const components = err.toString().split(': custom program error: ');
+    if (components.length !== 2) {
+      return null;
+    }
+
+    let errorCode: number;
+    try {
+      if (!components[1]) {
+        return null;
+      }
+      errorCode = parseInt(components[1]);
+    } catch (parseErr) {
+      return null;
+    }
+
+    // Parse user error.
+    const parts = components[0]?.split(' ');
+    const instructionIdxStr = parts?.[parts.length - 1];
+    let instruction: TransactionInstruction;
+    try {
+      if (!instructionIdxStr) {
+        return null;
+      }
+      const inst = txEnv.instructions[parseInt(instructionIdxStr)];
+      if (!inst) {
+        return null;
+      }
+      instruction = inst;
+    } catch (e) {
+      return null;
+    }
+
+    const errantProgramId = instruction.programId;
+    const programName =
+      programNameOverride ??
+      (errantProgramId ? programIDs[errantProgramId.toString()] : null);
+    const idlErrors = programName ? programErrors[programName] : null;
+    if (programName) {
+      const errorInfo = idlErrors?.get(errorCode);
+      if (errorInfo !== undefined) {
+        return new ProgramError(errorInfo, err.toString(), programName);
+      }
+    }
+
+    return parseError(errantProgramId, errorCode, err);
+  }
+
+  get code(): number {
+    return this.errorInfo.code;
+  }
+
+  get errorName(): string {
+    return this.errorInfo.name;
+  }
+
+  override toString(): string {
+    return this.errorInfo.displayMessage;
+  }
+}
+
+const LangErrorCode = {
+  // Instructions.
+  InstructionMissing: 100,
+  InstructionFallbackNotFound: 101,
+  InstructionDidNotDeserialize: 102,
+  InstructionDidNotSerialize: 103,
+
+  // IDL instructions.
+  IdlInstructionStub: 120,
+  IdlInstructionInvalidProgram: 121,
+
+  // Constraints.
+  ConstraintMut: 140,
+  ConstraintBelongsTo: 141,
+  ConstraintSigner: 142,
+  ConstraintRaw: 143,
+  ConstraintOwner: 144,
+  ConstraintRentExempt: 145,
+  ConstraintSeeds: 146,
+  ConstraintExecutable: 147,
+  ConstraintState: 148,
+  ConstraintAssociated: 149,
+  ConstraintAssociatedInit: 150,
+  ConstraintClose: 151,
+
+  // Accounts.
+  AccountDiscriminatorAlreadySet: 160,
+  AccountDiscriminatorNotFound: 161,
+  AccountDiscriminatorMismatch: 162,
+  AccountDidNotDeserialize: 163,
+  AccountDidNotSerialize: 164,
+  AccountNotEnoughKeys: 165,
+  AccountNotMutable: 166,
+  AccountNotProgramOwned: 167,
+
+  // State.
+  StateInvalidAddress: 180,
+
+  // Used for APIs that shouldn't be used anymore.
+  Deprecated: 299
+};
+
+const codesToName: Record<number, string> = Object.entries(
+  LangErrorCode
+).reduce(
+  (acc, el) => ({
+    ...acc,
+    [el[1]]: el[0]
+  }),
+  {}
+);
+
+const LangErrorMessage = new Map([
+  // Instructions.
+  [
+    LangErrorCode.InstructionMissing,
+    '8 byte instruction identifier not provided'
+  ],
+  [
+    LangErrorCode.InstructionFallbackNotFound,
+    'Fallback functions are not supported'
+  ],
+  [
+    LangErrorCode.InstructionDidNotDeserialize,
+    'The program could not deserialize the given instruction'
+  ],
+  [
+    LangErrorCode.InstructionDidNotSerialize,
+    'The program could not serialize the given instruction'
+  ],
+
+  // Idl instructions.
+  [
+    LangErrorCode.IdlInstructionStub,
+    'The program was compiled without idl instructions'
+  ],
+  [
+    LangErrorCode.IdlInstructionInvalidProgram,
+    'The transaction was given an invalid program for the IDL instruction'
+  ],
+
+  // Constraints.
+  [LangErrorCode.ConstraintMut, 'A mut constraint was violated'],
+  [LangErrorCode.ConstraintBelongsTo, 'A belongs_to constraint was violated'],
+  [LangErrorCode.ConstraintSigner, 'A signer constraint was violated'],
+  [LangErrorCode.ConstraintRaw, 'A raw constraint as violated'],
+  [LangErrorCode.ConstraintOwner, 'An owner constraint was violated'],
+  [LangErrorCode.ConstraintRentExempt, 'A rent exempt constraint was violated'],
+  [LangErrorCode.ConstraintSeeds, 'A seeds constraint was violated'],
+  [LangErrorCode.ConstraintExecutable, 'An executable constraint was violated'],
+  [LangErrorCode.ConstraintState, 'A state constraint was violated'],
+  [LangErrorCode.ConstraintAssociated, 'An associated constraint was violated'],
+  [
+    LangErrorCode.ConstraintAssociatedInit,
+    'An associated init constraint was violated'
+  ],
+  [LangErrorCode.ConstraintClose, 'A close constraint was violated'],
+
+  // Accounts.
+  [
+    LangErrorCode.AccountDiscriminatorAlreadySet,
+    'The account discriminator was already set on this account'
+  ],
+  [
+    LangErrorCode.AccountDiscriminatorNotFound,
+    'No 8 byte discriminator was found on the account'
+  ],
+  [
+    LangErrorCode.AccountDiscriminatorMismatch,
+    '8 byte discriminator did not match what was expected'
+  ],
+  [LangErrorCode.AccountDidNotDeserialize, 'Failed to deserialize the account'],
+  [LangErrorCode.AccountDidNotSerialize, 'Failed to serialize the account'],
+  [
+    LangErrorCode.AccountNotEnoughKeys,
+    'Not enough account keys given to the instruction'
+  ],
+  [LangErrorCode.AccountNotMutable, 'The given account is not mutable'],
+  [
+    LangErrorCode.AccountNotProgramOwned,
+    'The given account is not owned by the executing program'
+  ],
+
+  // State.
+  [
+    LangErrorCode.StateInvalidAddress,
+    'The given state account does not have the correct address'
+  ],
+
+  // Misc.
+  [
+    LangErrorCode.Deprecated,
+    'The API being used is deprecated and should no longer be used'
+  ]
+]);
+
+export const handlers: Record<
+  string,
+  {
+    name: KnownProgram;
+    displayMessage: (code: number) => string | undefined;
+  }
+> = {
+  [TOKEN_PROGRAM_ID.toString()]: {
+    name: 'Token' as const,
+    displayMessage: (code: number): string | undefined => {
+      switch (code) {
+        case 1:
+          return 'Insufficient token balance (need more SOL)';
+      }
+    }
+  },
+  [ASSOCIATED_TOKEN_PROGRAM_ID.toString()]: {
+    name: 'AToken' as const,
+    displayMessage: (code: number): string | undefined => {
+      switch (code) {
+        case 1:
+          return 'Insufficient token balance (need more SOL)';
+      }
+    }
+  }
+};
+
+/**
+ * Parses an error into a ProgramError if possible.
+ * @param errantProgramID
+ * @param code
+ * @param err
+ * @returns
+ */
+export const parseError = (
+  errantProgramID: PublicKey,
+  code: number,
+  err: Error
+): ProgramError | null => {
+  const handler = handlers[errantProgramID.toString()];
+  if (handler) {
+    return new ProgramError(
+      {
+        code,
+        displayMessage:
+          handler.displayMessage(code) ?? `unknown (code ${code})`,
+        name: code.toString()
+      },
+      err.toString(),
+      handler.name
+    );
+  }
+
+  // Parse framework internal error.
+  const message = LangErrorMessage.get(code);
+  if (message !== undefined) {
+    return new ProgramError(
+      {
+        code,
+        msg: message,
+        name: codesToName[code] ?? 'AnchorInternalUnknown',
+        displayMessage: message ?? `unknown (code ${code})`
+      },
+      err.toString()
+    );
+  }
+
+  // Unable to parse the error. Just return the untranslated error.
+  return null;
+};
diff --git a/helpers/utils.ts b/helpers/utils.ts
index d98d438c..2b3b3b6f 100644
--- a/helpers/utils.ts
+++ b/helpers/utils.ts
@@ -149,6 +149,10 @@ export const generateInspectLink = (
   )}`;
 };
 
+export const SYSVAR_OWNER = new PublicKey(
+  'Sysvar1111111111111111111111111111111111111'
+);
+
 export enum PROGRAM_NAMES {
   // native built-ins
   ADDRESS_MAP = 'Address Map Program',
diff --git a/hooks/goki/useSubaccountInfo.ts b/hooks/goki/useSubaccountInfo.ts
new file mode 100644
index 00000000..669263c1
--- /dev/null
+++ b/hooks/goki/useSubaccountInfo.ts
@@ -0,0 +1,21 @@
+import { findSubaccountInfoAddress } from '@gokiprotocol/client';
+import type { PublicKey } from '@solana/web3.js';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import { useSubaccountInfoData } from 'helpers/parser';
+
+export const useSubaccountInfo = (key: PublicKey | null | undefined) => {
+  const { data: subaccountInfoKey } = useQuery(
+    ['subaccountInfoKey', key?.toString()],
+    async (): Promise<PublicKey> => {
+      invariant(key);
+      const [sub] = await findSubaccountInfoAddress(key);
+      return sub;
+    },
+    {
+      enabled: !!key
+    }
+  );
+  return useSubaccountInfoData(subaccountInfoKey);
+};
diff --git a/hooks/useSignaturesForAddress.ts b/hooks/useSignaturesForAddress.ts
new file mode 100644
index 00000000..f5ff0e7f
--- /dev/null
+++ b/hooks/useSignaturesForAddress.ts
@@ -0,0 +1,24 @@
+import { useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+export const useSignaturesForAddress = (
+  address: PublicKey | null | undefined
+) => {
+  const { connection, network } = useSolana();
+  return useQuery(
+    ['signaturesForAddress', network, address?.toString()],
+    async () => {
+      invariant(address);
+      return await connection.getSignaturesForAddress(
+        address,
+        undefined,
+        'confirmed'
+      );
+    },
+    {
+      enabled: !!address
+    }
+  );
+};
diff --git a/hooks/useTransactions.ts b/hooks/useTransactions.ts
new file mode 100644
index 00000000..3cff18d8
--- /dev/null
+++ b/hooks/useTransactions.ts
@@ -0,0 +1,26 @@
+import { useSolana } from '@saberhq/use-solana';
+import type { TransactionSignature } from '@solana/web3.js';
+import { useQueries } from 'react-query';
+
+export const useTransactions = (txSigs: TransactionSignature[]) => {
+  const { network, connection } = useSolana();
+  return useQueries(
+    txSigs.map(sig => {
+      return {
+        queryKey: ['txSig', network, sig],
+        queryFn: async () => {
+          const tx = await connection.getTransaction(sig, {
+            commitment: 'confirmed'
+          });
+          if (!tx) {
+            return null;
+          }
+          return {
+            sig,
+            tx
+          };
+        }
+      };
+    })
+  );
+};
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 13025243..fe4f2f2b 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -17,6 +17,7 @@ import { GovernorProvider } from 'hooks/tribeca/useGovernor';
 import 'degen/styles';
 import '../styles/globals.css';
 import 'react-toastify/dist/ReactToastify.css';
+import { onSailError } from 'helpers/error';
 
 const queryClient = new QueryClient();
 const network = process.env.NETWORK as Network;
@@ -77,9 +78,7 @@ function MyApp({ Component, pageProps }: AppProps) {
         >
           <SailProvider
             initialState={{
-              onSailError: err => {
-                console.log(err);
-              }
+              onSailError
             }}
           >
             <SDKProvider>
@@ -95,7 +94,6 @@ function MyApp({ Component, pageProps }: AppProps) {
                 ) : (
                   <>
                     <Component {...pageProps} />
-                    <ToastContainer theme="dark" position="bottom-right" />
                   </>
                 )}
               </GovernorProvider>
@@ -103,8 +101,9 @@ function MyApp({ Component, pageProps }: AppProps) {
           </SailProvider>
         </WalletKitProvider>
       </QueryClientProvider>
+      <ToastContainer theme="dark" position="bottom-right" />
     </ThemeProvider>
   );
 }
 
-export default MyApp; 
+export default MyApp;

From 5efdf0b2b801915fad48acdbcb8dee54188f70a7 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Wed, 11 May 2022 07:46:34 -0500
Subject: [PATCH 032/101] Initial commit for governance

---
 .env.example                                  |    6 +-
 actions/Memo.tsx                              |   52 +
 actions/RawTX.tsx                             |   57 +
 actions/types.tsx                             |   65 +
 components/AsyncButton.tsx                    |   39 +
 components/HelperCard.tsx                     |   32 +
 components/LabeledInput.tsx                   |   43 +
 components/Modal/ModalButton.tsx              |   45 +
 components/Modal/ModalInner.tsx               |   54 +
 components/Modal/context.tsx                  |   16 +
 components/Modal/index.tsx                    |  113 +
 .../Proposals/ProposalCreateView/index.tsx    |    5 +
 .../ProposalConfirmationModal/ProposalIX.tsx  |   23 +
 .../ProposalConfirmationModal/index.tsx       |  124 +
 .../locked-voter/ProposalCreateInner.tsx      |  246 ++
 .../locked-voter/ProposalTXForm.tsx           |   97 +
 .../ProposalCreateView/locked-voter/index.tsx |   25 +
 .../ActiveProposalVotingBars.tsx              |   67 +
 .../Proposals/ProposalsList/PageNav.tsx       |   63 +
 .../ProposalsList/PlaceholderCard.tsx         |   39 +
 .../Proposals/ProposalsList/ProposalCard.tsx  |   86 +
 .../ProposalsList/ProposalStateBadge.tsx      |   59 +
 .../ProposalsList/ProposalStateDate.tsx       |   72 +
 .../ProposalsList/ProposalStateLabel.tsx      |   43 +
 .../ProposalsList/ProposalSubtitle.tsx        |   32 +
 components/Proposals/ProposalsList/index.tsx  |  142 ++
 helpers/constants.ts                          |    9 +
 helpers/currencies.ts                         |  105 +
 helpers/fetchers.ts                           |   28 +
 helpers/format.ts                             |  249 ++
 helpers/idl/ve_honey.json                     |  707 +++++-
 .../instructions/parseNonAnchorInstruction.ts |  145 ++
 helpers/instructions/token/parsers.ts         |  115 +
 helpers/instructions/token/types.ts           |  237 ++
 .../upgradeable_loader/instructions.ts        |  223 ++
 .../upgradeable_loader/parsers.ts             |   72 +
 .../instructions/upgradeable_loader/types.ts  |  188 ++
 helpers/parser.ts                             |   66 +
 helpers/programs/veHoney.ts                   |   22 +
 helpers/sdk/constant.ts                       |   31 +
 helpers/sdk/gov.ts                            |   84 +
 helpers/sdk/index.ts                          |    1 +
 helpers/sdk/vehoney.ts                        |  193 +-
 helpers/types/ve_honey.ts                     | 2008 ++++++++++++++---
 helpers/utils.ts                              |  281 ++-
 helpers/validators/pubkey.ts                  |   49 +
 hooks/deploydao/stripTrailingNullBytes.ts     |    9 +
 hooks/deploydao/types.ts                      |  174 ++
 .../deploydao/useCanonicalVerifiableBuild.ts  |   19 +
 hooks/deploydao/useProgramData.ts             |   57 +
 hooks/deploydao/useProgramIndex.ts            |   21 +
 hooks/deploydao/useProgramMeta.ts             |   29 +
 hooks/deploydao/useProgramRelease.ts          |   20 +
 hooks/tribeca/useEscrow.ts                    |   99 +
 hooks/tribeca/useExecutiveCouncil.ts          |   92 +
 hooks/tribeca/useGovernor.ts                  |  180 ++
 hooks/tribeca/useProposalVotes.ts             |    3 +
 hooks/tribeca/useProposals.ts                 |  265 +++
 hooks/tribeca/useVote.ts                      |   23 +
 hooks/useIDLs.ts                              |   34 +
 hooks/useParsedInstruction.ts                 |  195 ++
 hooks/useProgramMeta.ts                       |   40 +
 hooks/useSmartWalletAddress.tsx               |   35 +
 icons/PulsingDot.tsx                          |   35 +
 package.json                                  |   13 +-
 pages/_app.tsx                                |   65 +-
 pages/governance/index.tsx                    |   96 +-
 pages/governance/proposals/create.tsx         |   13 +
 pages/governance/proposals/index.tsx          |   16 +
 yarn.lock                                     |  786 ++++++-
 70 files changed, 8363 insertions(+), 414 deletions(-)
 create mode 100644 actions/Memo.tsx
 create mode 100644 actions/RawTX.tsx
 create mode 100644 actions/types.tsx
 create mode 100644 components/AsyncButton.tsx
 create mode 100644 components/HelperCard.tsx
 create mode 100644 components/LabeledInput.tsx
 create mode 100644 components/Modal/ModalButton.tsx
 create mode 100644 components/Modal/ModalInner.tsx
 create mode 100644 components/Modal/context.tsx
 create mode 100644 components/Modal/index.tsx
 create mode 100644 components/Proposals/ProposalCreateView/index.tsx
 create mode 100644 components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
 create mode 100644 components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
 create mode 100644 components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
 create mode 100644 components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
 create mode 100644 components/Proposals/ProposalCreateView/locked-voter/index.tsx
 create mode 100644 components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
 create mode 100644 components/Proposals/ProposalsList/PageNav.tsx
 create mode 100644 components/Proposals/ProposalsList/PlaceholderCard.tsx
 create mode 100644 components/Proposals/ProposalsList/ProposalCard.tsx
 create mode 100644 components/Proposals/ProposalsList/ProposalStateBadge.tsx
 create mode 100644 components/Proposals/ProposalsList/ProposalStateDate.tsx
 create mode 100644 components/Proposals/ProposalsList/ProposalStateLabel.tsx
 create mode 100644 components/Proposals/ProposalsList/ProposalSubtitle.tsx
 create mode 100644 components/Proposals/ProposalsList/index.tsx
 create mode 100644 helpers/constants.ts
 create mode 100644 helpers/currencies.ts
 create mode 100644 helpers/fetchers.ts
 create mode 100644 helpers/format.ts
 create mode 100644 helpers/instructions/parseNonAnchorInstruction.ts
 create mode 100644 helpers/instructions/token/parsers.ts
 create mode 100644 helpers/instructions/token/types.ts
 create mode 100644 helpers/instructions/upgradeable_loader/instructions.ts
 create mode 100644 helpers/instructions/upgradeable_loader/parsers.ts
 create mode 100644 helpers/instructions/upgradeable_loader/types.ts
 create mode 100644 helpers/parser.ts
 create mode 100644 helpers/programs/veHoney.ts
 create mode 100644 helpers/sdk/gov.ts
 create mode 100644 helpers/validators/pubkey.ts
 create mode 100644 hooks/deploydao/stripTrailingNullBytes.ts
 create mode 100644 hooks/deploydao/types.ts
 create mode 100644 hooks/deploydao/useCanonicalVerifiableBuild.ts
 create mode 100644 hooks/deploydao/useProgramData.ts
 create mode 100644 hooks/deploydao/useProgramIndex.ts
 create mode 100644 hooks/deploydao/useProgramMeta.ts
 create mode 100644 hooks/deploydao/useProgramRelease.ts
 create mode 100644 hooks/tribeca/useEscrow.ts
 create mode 100644 hooks/tribeca/useExecutiveCouncil.ts
 create mode 100644 hooks/tribeca/useGovernor.ts
 create mode 100644 hooks/tribeca/useProposalVotes.ts
 create mode 100644 hooks/tribeca/useProposals.ts
 create mode 100644 hooks/tribeca/useVote.ts
 create mode 100644 hooks/useIDLs.ts
 create mode 100644 hooks/useParsedInstruction.ts
 create mode 100644 hooks/useProgramMeta.ts
 create mode 100644 hooks/useSmartWalletAddress.tsx
 create mode 100644 icons/PulsingDot.tsx
 create mode 100644 pages/governance/proposals/create.tsx
 create mode 100644 pages/governance/proposals/index.tsx

diff --git a/.env.example b/.env.example
index b9a6e227..8031f110 100644
--- a/.env.example
+++ b/.env.example
@@ -1,2 +1,6 @@
 NEXT_PUBLIC_RPC_NODE = 'https://api.mainnet-beta.solana.com'
-NEXT_PUBLIC_GA=
\ No newline at end of file
+NEXT_PUBLIC_STAKE_POOL_ADDR=
+NEXT_PUBLIC_VOTE_PROGRAM_ID=
+NEXT_PUBLIC_GOVERNOR_ADDRESS=
+NEXT_PUBLIC_SMART_WALLET_ADDRESS=
+NEXT_PUBLIC_LOCKER_ADDR=
\ No newline at end of file
diff --git a/actions/Memo.tsx b/actions/Memo.tsx
new file mode 100644
index 00000000..0691c4e0
--- /dev/null
+++ b/actions/Memo.tsx
@@ -0,0 +1,52 @@
+import {
+  buildStubbedTransaction,
+  createMemoInstruction
+} from '@saberhq/solana-contrib';
+import { useSolana } from '@saberhq/use-solana';
+import { useEffect, useState } from 'react';
+import { Text, Textarea } from 'degen';
+import { serializeToBase64 } from 'helpers/utils';
+import type { ActionFormProps } from './types';
+
+export const Memo: React.FC<ActionFormProps> = ({
+  actor,
+  setError,
+  setTxRaw
+}: ActionFormProps) => {
+  const [memo, setMemo] = useState<string>('');
+  const { network } = useSolana();
+
+  useEffect(() => {
+    if (memo === '') {
+      setError('Memo cannot be empty');
+    }
+  }, [memo, setError]);
+
+  return (
+    <>
+      <Textarea
+        id="memo"
+        // tw="h-auto"
+        label="Memo"
+        rows={4}
+        placeholder="The memo for the DAO to send."
+        value={memo}
+        onChange={e => {
+          setMemo(e.target.value);
+          try {
+            const txStub = buildStubbedTransaction(
+              network !== 'localnet' ? network : 'devnet',
+              [createMemoInstruction(e.target.value, [actor])]
+            );
+            setTxRaw(serializeToBase64(txStub));
+            setError(null);
+          } catch (ex) {
+            setTxRaw('');
+            console.debug('Error creating memo', ex);
+            setError('Memo is too long');
+          }
+        }}
+      />
+    </>
+  );
+};
diff --git a/actions/RawTX.tsx b/actions/RawTX.tsx
new file mode 100644
index 00000000..5d8d5494
--- /dev/null
+++ b/actions/RawTX.tsx
@@ -0,0 +1,57 @@
+import { extractErrorMessage } from '@saberhq/sail';
+import { Transaction } from '@solana/web3.js';
+import { Box, Text, Textarea } from 'degen';
+
+import { HelperCard } from 'components/HelperCard';
+import type { ActionFormProps } from './types';
+
+export const RawTX: React.FC<ActionFormProps> = ({
+  setError,
+  txRaw,
+  setTxRaw
+}: ActionFormProps) => {
+  return (
+    <>
+      <HelperCard variant="warn">
+        <Text size="headingTwo">
+          Warning: this page is for advanced users only. Invalid transaction
+          data may cause this page to freeze. Documentation will be coming soon.
+        </Text>
+      </HelperCard>
+      <HelperCard variant="muted">
+        <Box
+        // tw="prose prose-sm prose-light"
+        >
+          <p>
+            This page allows proposing any arbitrary transaction for execution
+            by the DAO. The fee payer and recent blockhash will not be used.
+          </p>
+        </Box>
+      </HelperCard>
+      <Textarea
+        label="Transaction (base64)"
+        id="instructionsRaw"
+        rows={4}
+        placeholder="Paste raw base64 encoded transaction message"
+        value={txRaw}
+        onChange={e => {
+          setTxRaw(e.target.value);
+          try {
+            const buffer = Buffer.from(e.target.value, 'base64');
+            const tx = Transaction.from(buffer);
+            if (tx.instructions.length === 0) {
+              throw new Error('no instruction data');
+            }
+            setError(null);
+          } catch (err) {
+            setError(
+              `Invalid transaction data: ${
+                extractErrorMessage(err) ?? '(unknown)'
+              }`
+            );
+          }
+        }}
+      />
+    </>
+  );
+};
diff --git a/actions/types.tsx b/actions/types.tsx
new file mode 100644
index 00000000..461d13fe
--- /dev/null
+++ b/actions/types.tsx
@@ -0,0 +1,65 @@
+import type { PublicKey } from '@solana/web3.js';
+// import type { GovernorConfig } from '@tribecahq/registry';
+
+import { Memo } from './Memo';
+import { RawTX } from './RawTX';
+
+export interface ActorContext {
+  /**
+   * Governor.
+   */
+  governor?: PublicKey;
+  /**
+   * The veLocker.
+   */
+  locker?: PublicKey;
+  /**
+   * Settings for minting tokens as the DAO. Enabling this allows DAO members to create "mint" proposals which can be used for grants.
+   */
+  // minter?: GovernorConfig['minter'];
+}
+
+export interface ActionFormProps {
+  actor: PublicKey;
+  payer: PublicKey;
+  ctx?: ActorContext | null;
+  setError: (err: string | null) => void;
+  txRaw: string;
+  setTxRaw: (txRaw: string) => void;
+}
+
+export interface Action {
+  title: string;
+  description?: string;
+  isEnabled?: (ctx: ActorContext) => boolean;
+  Renderer: React.FC<ActionFormProps>;
+}
+
+export const ACTION_TYPES = [
+  'Memo',
+  'Issue Tokens',
+  'Upgrade Program',
+  'Whitelist Program-Managed Vote Escrow',
+  'Raw Transaction (base64)'
+] as const;
+
+export type ActionType = typeof ACTION_TYPES[number];
+
+export const ACTIONS: Action[] = [
+  {
+    title: 'Memo',
+    description:
+      "A memo allows a DAO to attest a message on chain. Memo actions may be used to create proposals that don't have any on-chain actions.",
+    Renderer: Memo
+  },
+  // {
+  //   title: "Issue Revocable Token Grant",
+  //   description: "Issue a revocable grant of tokens on behalf of the DAO.",
+  //   isEnabled: ({ minter }) => !!minter,
+  //   Renderer: VenkoGrantAction,
+  // },
+  {
+    title: 'Raw Transaction (base64)',
+    Renderer: RawTX
+  }
+];
diff --git a/components/AsyncButton.tsx b/components/AsyncButton.tsx
new file mode 100644
index 00000000..45d2a232
--- /dev/null
+++ b/components/AsyncButton.tsx
@@ -0,0 +1,39 @@
+import type { GokiSDK } from '@gokiprotocol/client';
+import { useWalletKit } from '@gokiprotocol/walletkit';
+import React from 'react';
+import { Button } from 'degen';
+import type { Props as ButtonProps } from 'degen/dist/types/components/Button';
+import { useSDK } from 'helpers/sdk';
+
+interface Props extends Omit<ButtonProps, 'onClick' | 'tone'> {
+  onClick?: (sdkMut: GokiSDK) => Promise<void> | void;
+  connectWalletOverride?: string;
+}
+
+export const AsyncButton: React.FC<Props> = ({
+  onClick,
+  children,
+  connectWalletOverride,
+  ...rest
+}: Props) => {
+  const { connect } = useWalletKit();
+  const { sdkMut } = useSDK();
+  return sdkMut !== null ? (
+    <Button
+      onClick={
+        onClick
+          ? async () => {
+              await onClick(sdkMut);
+            }
+          : undefined
+      }
+      {...rest}
+    >
+      {children}
+    </Button>
+  ) : (
+    <Button {...rest} disabled={false} onClick={() => connect()}>
+      {connectWalletOverride ?? 'Connect Wallet'}
+    </Button>
+  );
+};
diff --git a/components/HelperCard.tsx b/components/HelperCard.tsx
new file mode 100644
index 00000000..cb2d1c17
--- /dev/null
+++ b/components/HelperCard.tsx
@@ -0,0 +1,32 @@
+import { Box } from 'degen';
+
+interface Props {
+  children?: React.ReactNode;
+  className?: string;
+  variant?: 'primary' | 'muted' | 'error' | 'warn';
+}
+
+export const HelperCard: React.FC<Props> = ({
+  children,
+  variant = 'primary',
+  className
+}: Props) => {
+  let border = 'border';
+  switch (variant) {
+    case 'primary':
+    case 'muted':
+    case 'error':
+    case 'warn':
+  }
+  return (
+    <Box
+      paddingX="4"
+      paddingY="2"
+      borderWidth="1"
+      fontSize="small"
+      className={className}
+    >
+      {children}
+    </Box>
+  );
+};
diff --git a/components/LabeledInput.tsx b/components/LabeledInput.tsx
new file mode 100644
index 00000000..5a33568f
--- /dev/null
+++ b/components/LabeledInput.tsx
@@ -0,0 +1,43 @@
+import { Box, Text } from 'degen';
+import type { InputHTMLAttributes, TextareaHTMLAttributes } from 'react';
+
+type CommonProps<T> = InputHTMLAttributes<T> & TextareaHTMLAttributes<T>;
+
+interface Props<T extends HTMLElement> extends CommonProps<T> {
+  Component: React.FC<CommonProps<T>>;
+  label: string;
+  error?: string;
+  touched?: boolean;
+  footer?: React.ReactNode;
+}
+
+export const LabeledInput = <T extends HTMLElement>({
+  id,
+  label,
+  Component,
+  error,
+  touched,
+  footer,
+  ...commonProps
+}: Props<T>) => {
+  return (
+    <Box as="label" display="flex" flexDirection="column" gap="1" htmlFor={id}>
+      <Text size="small">{label}</Text>
+      <Component
+        {...commonProps}
+        id={id}
+        // css={[touched && error && tw`ring-1 ring-red-500`]}
+      />
+      {touched && error && (
+        <Text as="span" size="small" color="red">
+          {error}
+        </Text>
+      )}
+      {footer !== undefined && (
+        <Text as="span" size="small">
+          {footer}
+        </Text>
+      )}
+    </Box>
+  );
+};
diff --git a/components/Modal/ModalButton.tsx b/components/Modal/ModalButton.tsx
new file mode 100644
index 00000000..7786ee3f
--- /dev/null
+++ b/components/Modal/ModalButton.tsx
@@ -0,0 +1,45 @@
+import { useState } from "react";
+
+import { Button } from "../Button";
+import { Modal } from ".";
+
+type Props = {
+  buttonLabel: string;
+  buttonProps?: React.ComponentProps<typeof Button>;
+  children?: React.ReactNode;
+  className?: string;
+  onDismiss?: () => void;
+};
+
+export const ModalButton: React.FC<Props> = ({
+  buttonLabel,
+  buttonProps,
+  children,
+  className,
+  onDismiss,
+}: Props) => {
+  const [showModal, setShowModal] = useState<boolean>(false);
+  return (
+    <>
+      <Modal
+        tw="p-0"
+        isOpen={showModal}
+        onDismiss={() => {
+          onDismiss?.();
+          setShowModal(false);
+        }}
+        className={className}
+      >
+        {children}
+      </Modal>
+      <Button
+        {...buttonProps}
+        onClick={() => {
+          setShowModal(true);
+        }}
+      >
+        {buttonLabel}
+      </Button>
+    </>
+  );
+};
diff --git a/components/Modal/ModalInner.tsx b/components/Modal/ModalInner.tsx
new file mode 100644
index 00000000..436b7f9b
--- /dev/null
+++ b/components/Modal/ModalInner.tsx
@@ -0,0 +1,54 @@
+import { Box, Button, IconClose } from 'degen';
+import { useModal } from './context';
+
+interface Props {
+  title: string;
+  children?: React.ReactNode;
+  buttonProps?: React.ComponentProps<typeof Button>;
+  className?: string;
+}
+
+export const ModalInner: React.FC<Props> = ({
+  title,
+  children,
+  buttonProps,
+  className
+}: Props) => {
+  const { close } = useModal();
+  return (
+    <>
+      <Box
+        position="relative"
+        fontWeight="bold"
+        textAlign="center"
+        paddingY="4"
+        // tw="relative border-b dark:border-b-warmGray-800 dark:text-white font-bold text-base text-center py-4"
+      >
+        <Box
+          paddingX="8"
+          overflow="hidden"
+          whiteSpace="nowrap"
+          // tw="px-8 overflow-ellipsis overflow-hidden whitespace-nowrap"
+        >
+          {title}
+        </Box>
+        <Box position="absolute" display="flex" right="4" top="0">
+          <Button
+            onClick={() => close()}
+            // tw="absolute right-4 h-full flex items-center top-0 text-warmGray-600 hover:text-warmGray-200 transition-colors"
+          >
+            <IconClose />
+          </Button>
+        </Box>
+      </Box>
+      <Box padding="8" className={className}>
+        {children}
+        {buttonProps && (
+          <Box marginTop="8" height="10">
+            <Button width="full" {...buttonProps} />
+          </Box>
+        )}
+      </Box>
+    </>
+  );
+};
diff --git a/components/Modal/context.tsx b/components/Modal/context.tsx
new file mode 100644
index 00000000..9820ec55
--- /dev/null
+++ b/components/Modal/context.tsx
@@ -0,0 +1,16 @@
+import { noop } from "lodash";
+import { createContainer } from "unstated-next";
+
+const useModalInner = (
+  close: () => void = noop
+): {
+  close: () => void;
+} => {
+  if (!close) {
+    throw new Error("no close provided");
+  }
+  return { close };
+};
+
+export const { useContainer: useModal, Provider: ModalProvider } =
+  createContainer(useModalInner);
diff --git a/components/Modal/index.tsx b/components/Modal/index.tsx
new file mode 100644
index 00000000..50f47672
--- /dev/null
+++ b/components/Modal/index.tsx
@@ -0,0 +1,113 @@
+import '@reach/dialog/styles.css';
+
+import { css } from '@emotion/react';
+import styled from '@emotion/styled';
+import { DialogContent, DialogOverlay } from '@reach/dialog';
+import { animated, useSpring, useTransition } from '@react-spring/web';
+import React from 'react';
+import { isMobile } from 'react-device-detect';
+import { useGesture } from 'react-use-gesture';
+
+import { ModalProvider } from './context';
+
+export interface ModalProps {
+  children: React.ReactNode;
+  isOpen: boolean;
+  onDismiss: () => void;
+  darkenOverlay?: boolean;
+  className?: string;
+}
+
+export const Modal: React.FC<ModalProps> = ({
+  className,
+  children,
+  isOpen,
+  onDismiss,
+  darkenOverlay = true
+}: ModalProps) => {
+  const fadeTransition = useTransition(isOpen, {
+    config: { duration: 150 },
+    from: { opacity: 0 },
+    enter: { opacity: 1 },
+    leave: { opacity: 0 }
+  });
+
+  const [{ y }, set] = useSpring(() => ({
+    y: 0,
+    config: { mass: 1, tension: 210, friction: 20 }
+  }));
+  const bind = useGesture({
+    onDrag: state => {
+      set({
+        y: state.down ? state.movement[1] : 0
+      });
+      if (
+        state.movement[1] > 300 ||
+        (state.velocity > 3 && state.direction[1] > 0)
+      ) {
+        onDismiss();
+      }
+    }
+  });
+
+  return (
+    <>
+      {fadeTransition(
+        (transition, item) =>
+          item && (
+            <StyledDialogOverlay
+              style={transition}
+              isOpen={isOpen || transition.opacity.get() !== 0}
+              onDismiss={onDismiss}
+              darkenOverlay={darkenOverlay}
+            >
+              <ModalWrapper
+                className={className}
+                aria-label="dialog content"
+                {...(isMobile
+                  ? {
+                      ...bind(),
+                      style: {
+                        transform: y.to(n => `translateY(${n > 0 ? n : 0}px)`)
+                      }
+                    }
+                  : {})}
+              >
+                <ModalProvider initialState={onDismiss}>
+                  {children}
+                </ModalProvider>
+              </ModalWrapper>
+            </StyledDialogOverlay>
+          )
+      )}
+    </>
+  );
+};
+
+const ModalWrapper = styled(animated(DialogContent))``;
+
+// const ModalWrapper = styled(animated(DialogContent))`
+//   ${tw`shadow-2xl w-full max-w-lg p-6 rounded-lg relative`}
+//   ${tw`dark:(bg-warmGray-850)`}
+// `;
+
+const StyledDialogOverlay = styled(animated(DialogOverlay), {
+  shouldForwardProp: prop => prop !== 'darkenOverlay'
+})<{
+  darkenOverlay: boolean;
+}>`
+  &[data-reach-dialog-overlay] {
+    z-index: 11 !important;
+  }
+  [data-reach-dialog-content] {
+    padding: 0;
+  }
+  ${({ darkenOverlay }) =>
+    darkenOverlay
+      ? css`
+          background: rgba(0, 0, 0, 0.55);
+        `
+      : css`
+          background: none;
+        `}
+`;
diff --git a/components/Proposals/ProposalCreateView/index.tsx b/components/Proposals/ProposalCreateView/index.tsx
new file mode 100644
index 00000000..c22b01da
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/index.tsx
@@ -0,0 +1,5 @@
+import { ProposalCreateView as LockedVoter } from './locked-voter';
+
+export const ProposalCreateView: React.FC = () => {
+  return <LockedVoter />;
+};
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
new file mode 100644
index 00000000..da20620e
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
@@ -0,0 +1,23 @@
+import type { TransactionInstruction } from '@solana/web3.js';
+import { Box } from 'degen';
+
+import { useParsedInstruction } from 'hooks/useParsedInstruction';
+
+interface Props {
+  ix: TransactionInstruction;
+}
+
+export const ProposalIX: React.FC<Props> = ({ ix }: Props) => {
+  const parsedIX = useParsedInstruction(ix);
+  return (
+    <Box
+      opacity="50"
+      paddingX="4"
+      paddingY="2"
+      fontSize="small"
+      fontWeight="semiBold"
+    >
+      {parsedIX.title}
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
new file mode 100644
index 00000000..a676cf65
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
@@ -0,0 +1,124 @@
+import { useSail } from '@saberhq/sail';
+import { buildStubbedTransaction } from '@saberhq/solana-contrib';
+import { useSolana } from '@saberhq/use-solana';
+import type { TransactionInstruction } from '@solana/web3.js';
+import { GovernorWrapper } from '@tribecahq/tribeca-sdk';
+import ReactMarkdown from 'react-markdown';
+import invariant from 'tiny-invariant';
+
+import { useSDK } from 'helpers/sdk';
+import { useGovernor, useGovernorParams } from 'hooks/tribeca/useGovernor';
+// import { notify } from '../../../../../../../utils/notifications';
+import { HelperCard } from 'components/HelperCard';
+import type { ModalProps } from 'components/Modal';
+import { Modal } from 'components/Modal';
+import { ModalInner } from 'components/Modal/ModalInner';
+import { ProposalIX } from './ProposalIX';
+import { useRouter } from 'next/router';
+import { Box, IconLink, Text } from 'degen';
+
+type Props = Omit<ModalProps, 'children'> & {
+  proposal: {
+    title: string;
+    description: string;
+    instructions: TransactionInstruction[];
+  };
+};
+
+export const ProposalConfirmModal: React.FC<Props> = ({
+  proposal,
+  ...modalProps
+}: Props) => {
+  const { network } = useSolana();
+  const { tribecaMut } = useSDK();
+  const { governor, minActivationThreshold } = useGovernor();
+  const { votingPeriodFmt } = useGovernorParams();
+  const { handleTX } = useSail();
+  const router = useRouter();
+
+  const doProposeTransaction = async () => {
+    invariant(tribecaMut);
+    const gov = new GovernorWrapper(tribecaMut, governor!);
+    const createProposal = await gov.createProposal({
+      instructions: proposal.instructions
+    });
+    const createProposalMetaTX = await gov.createProposalMeta({
+      proposal: createProposal.proposal,
+      title: proposal.title,
+      descriptionLink: proposal.description
+    });
+    for (const txEnv of [createProposal.tx, createProposalMetaTX]) {
+      const { pending, success } = await handleTX(txEnv, 'Create Proposal');
+      if (!success || !pending) {
+        return;
+      }
+      await pending.wait();
+    }
+    // notify({
+    //   message: `Proposal ${`000${createProposal.index.toString()}`.slice(
+    //     -4
+    //   )} created`
+    // });
+    router.push(`proposals/${createProposal.index.toString()}`);
+    modalProps.onDismiss();
+  };
+
+  return (
+    <Modal
+      // tw="p-0 dark:text-white"
+      {...modalProps}
+    >
+      <ModalInner
+        title={`Proposal: ${proposal.title}`}
+        buttonProps={{
+          disabled: !tribecaMut,
+          variant: 'primary',
+          onClick: doProposeTransaction,
+          children: 'Propose Transaction'
+        }}
+      >
+        <Box display="grid" paddingY="4" gap="4">
+          <HelperCard>
+            <Box as="p" marginBottom="1">
+              Tip: The proposal cannot be modified after submission, so please
+              verify all information before submitting.
+            </Box>
+            <Text as="p">
+              Once submitted, anyone with at least{' '}
+              {minActivationThreshold?.formatUnits()} may start the voting
+              period, i.e., activate the proposal. The voting period will then
+              immediately begin and last for {votingPeriodFmt}.
+            </Text>
+          </HelperCard>
+          <Text>
+            <div>
+              <ReactMarkdown>{proposal.description}</ReactMarkdown>
+            </div>
+          </Text>
+          <Box display="flex" flexDirection="column" gap="1.5">
+            {proposal.instructions.map((ix, i) => (
+              <ProposalIX key={i} ix={ix} />
+            ))}
+          </Box>
+          {network !== 'localnet' && proposal.instructions.length > 0 && (
+            <a
+              // tw="text-sm text-primary hover:text-white transition-colors flex items-center gap-2"
+              href={`https://${
+                network === 'mainnet-beta' ? '' : `${network}.`
+              }anchor.so/tx/inspector?message=${encodeURIComponent(
+                buildStubbedTransaction(network, proposal.instructions)
+                  .serializeMessage()
+                  .toString('base64')
+              )}`}
+              target="_blank"
+              rel="noreferrer"
+            >
+              <span>Preview on Anchor.so</span>
+              <IconLink />
+            </a>
+          )}
+        </Box>
+      </ModalInner>
+    </Modal>
+  );
+};
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
new file mode 100644
index 00000000..83fde3f0
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -0,0 +1,246 @@
+import { useMemo, useState } from 'react';
+import {
+  extractErrorMessage,
+  useAccountData,
+  useTXHandlers
+} from '@saberhq/sail';
+import { LAMPORTS_PER_SOL, SystemProgram, Transaction } from '@solana/web3.js';
+import ReactMarkdown from 'react-markdown';
+
+import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+// import { AsyncButton } from '../../../../../common/AsyncButton';
+// import { Button } from '../../../../../common/Button';
+// import { Card } from '../../../../../common/governance/Card';
+// import { HelperCard } from '../../../../../common/HelperCard';
+// import { InputText, Textarea } from '../../../../../common/inputs/InputText';
+// import { LabeledInput } from '../../../../../common/inputs/LabeledInput';
+import { ProposalConfirmModal } from './ProposalConfirmationModal';
+import { ProposalTXForm } from './ProposalTXForm';
+import { HelperCard } from 'components/HelperCard';
+import { Box, Button, Card, Heading, Input, Textarea, Text } from 'degen';
+import { AsyncButton } from 'components/AsyncButton';
+
+export const ProposalCreateInner: React.FC = () => {
+  const [title, setTitle] = useState<string>('');
+  const [description, setDescription] = useState<string>('');
+  const [discussionLink, setDiscussionLink] = useState<string>('');
+  const [txRaw, setTxRaw] = useState<string>('');
+  const [theError, setError] = useState<string | null>(null);
+  const { minActivationThreshold, manifest } = useGovernor();
+  const { signAndConfirmTX } = useTXHandlers();
+
+  const proposalCfg = manifest?.proposals;
+  const discussionRequired = !!proposalCfg?.discussion?.required;
+
+  const { tx, error: parseError } = useMemo(() => {
+    try {
+      const buffer = Buffer.from(txRaw, 'base64');
+      const tx = Transaction.from(buffer);
+      if (tx.instructions.length === 0) {
+        return { error: 'Transaction cannot be empty' };
+      }
+      return { tx };
+    } catch (e) {
+      return {
+        error: extractErrorMessage(e)
+      };
+    }
+  }, [txRaw]);
+
+  const error =
+    discussionRequired && !discussionLink
+      ? 'Discussion link is required'
+      : proposalCfg?.discussion?.prefix &&
+        !discussionLink.startsWith(proposalCfg.discussion.prefix)
+      ? 'Invalid discussion link'
+      : theError ?? parseError;
+
+  const [showConfirm, setShowConfirm] = useState<boolean>(false);
+  const { ownerInvokerKey } = useExecutiveCouncil();
+
+  // check to see if the payer is involved
+  // if so, we should be showing the funding button
+  const payerMut =
+    !!ownerInvokerKey &&
+    !!tx?.instructions
+      .flatMap(ix => ix.keys)
+      .find(
+        meta =>
+          meta.pubkey.equals(ownerInvokerKey) &&
+          meta.isWritable &&
+          meta.isSigner
+      )
+      ? ownerInvokerKey
+      : null;
+
+  const { data: payerMutData } = useAccountData(payerMut);
+  const currentPayerBalance =
+    payerMutData === undefined
+      ? undefined
+      : (payerMutData?.accountInfo.lamports ?? 0) / LAMPORTS_PER_SOL;
+
+  return (
+    <>
+      <ProposalConfirmModal
+        isOpen={showConfirm}
+        onDismiss={() => {
+          setShowConfirm(false);
+        }}
+        proposal={{
+          title,
+          description: discussionLink
+            ? `${description}\n\n[View Discussion](${discussionLink})`
+            : description,
+          instructions: tx?.instructions ?? []
+        }}
+      />
+      <Box
+        display="flex"
+        flexDirection="column"
+        gap="8"
+        // tw="flex flex-col gap-8 md:grid"
+        // css={css`
+        //   grid-template-columns: 400px 1fr;
+        // `}
+      >
+        <div>
+          <Card>
+            <Box display="grid" gap="4" paddingX="7" paddingY="6">
+              {/* <HelperCard variant="muted"> */}
+              <Box>
+                <Box as="p" color="white" marginBottom="2">
+                  You are creating a proposal draft.
+                </Box>
+                <Text as="p">
+                  If activated by a a DAO member with at least{' '}
+                  <strong>{minActivationThreshold?.formatUnits()}</strong>, the
+                  members of the DAO may vote to execute or reject the proposal.
+                </Text>
+              </Box>
+              {/* </HelperCard> */}
+              {proposalCfg?.notice && (
+                <HelperCard variant="primary">
+                  <div
+                  // css={css`
+                  //   p {
+                  //     ${tw`mb-2`}
+                  //   }
+                  //   a {
+                  //     ${tw`text-white`}
+                  //     &:hover {
+                  //       ${tw`underline`}
+                  //     }
+                  //   }
+                  // `}
+                  >
+                    <ReactMarkdown>{proposalCfg.notice}</ReactMarkdown>
+                  </div>
+                </HelperCard>
+              )}
+              {/* <label tw="flex flex-col gap-1" htmlFor="title">
+                <span tw="text-sm">Title (max 140 characters)</span> */}
+              <Input
+                label="Title (max 140 characters)"
+                id="title"
+                placeholder="A short summary of your proposal."
+                value={title}
+                maxLength={140}
+                onChange={e => setTitle(e.target.value)}
+              />
+              {/* </label> */}
+              {/* <label tw="flex flex-col gap-1" htmlFor="description"> */}
+              {/* <span tw="text-sm">Description (max 750 characters)</span> */}
+              <Textarea
+                label="Description (max 750 characters)"
+                id="description"
+                rows={4}
+                maxLength={750}
+                placeholder={`## Summary\nYour proposal will be formatted using Markdown.`}
+                value={description}
+                onChange={e => setDescription(e.target.value)}
+              />
+              {/* </label> */}
+              {proposalCfg?.discussion?.required && (
+                <Textarea
+                  // Component={InputText}
+                  id="discussionLink"
+                  required
+                  label="Link to discussion (required)"
+                  placeholder={`URL must start with "${
+                    proposalCfg?.discussion.prefix ?? ''
+                  }"`}
+                  // type="text"
+                  value={discussionLink}
+                  onChange={e => setDiscussionLink(e.target.value)}
+                  error={
+                    !discussionLink.startsWith(
+                      proposalCfg.discussion.prefix ?? ''
+                    )
+                      ? 'Invalid discussion link'
+                      : undefined
+                  }
+                  // touched={true}
+                />
+              )}
+            </Box>
+          </Card>
+        </div>
+        <Box display="flex" flexDirection="column" gap="4">
+          <Card padding="6">
+            <Heading>Proposal Action</Heading>
+            <Box display="grid" gap="4" paddingX="7" paddingY="6">
+              <ProposalTXForm
+                setError={setError}
+                txRaw={txRaw}
+                setTxRaw={setTxRaw}
+              />
+            </Box>
+          </Card>
+          <Box display="flex" gap="4">
+            {payerMut &&
+              currentPayerBalance !== undefined &&
+              currentPayerBalance < 0.5 && (
+                <AsyncButton
+                  width="full"
+                  // tw="flex-1"
+                  size="medium"
+                  onClick={async ({ provider }) => {
+                    await signAndConfirmTX(
+                      provider.newTX([
+                        SystemProgram.transfer({
+                          fromPubkey: provider.walletKey,
+                          toPubkey: payerMut,
+                          lamports: LAMPORTS_PER_SOL
+                        })
+                      ])
+                    );
+                  }}
+                >
+                  <Box display="flex" flexDirection="column">
+                    <span>Fund with 1 SOL</span>
+                    <Text as="span" size="small">
+                      (payer balance: {currentPayerBalance.toLocaleString()}{' '}
+                      SOL)
+                    </Text>
+                  </Box>
+                </AsyncButton>
+              )}
+            <Button
+              // tw="flex-1"
+              // size="md"
+              type="button"
+              disabled={!(tx && title && description) || !!error}
+              variant="primary"
+              onClick={() => {
+                setShowConfirm(true);
+              }}
+            >
+              {error ? error : 'Preview Proposal'}
+            </Button>
+          </Box>
+        </Box>
+      </Box>
+    </>
+  );
+};
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
new file mode 100644
index 00000000..93942d3f
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
@@ -0,0 +1,97 @@
+import { useState } from 'react';
+
+import type { ActionType } from 'actions/types';
+import { ACTIONS } from 'actions/types';
+import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { HelperCard } from 'components/HelperCard';
+import { Box, Field, Spinner, Text } from 'degen';
+// import { Select } from '../../../../../common/inputs/InputText';
+// import { LoadingPage } from '../../../../../common/LoadingPage';
+
+interface Props {
+  txRaw: string;
+  setError: (error: string | null) => void;
+  setTxRaw: (txRaw: string) => void;
+}
+
+export const ProposalTXForm: React.FC<Props> = ({
+  setError,
+  txRaw,
+  setTxRaw
+}: Props) => {
+  const [actionType, setActionType] = useState<ActionType>('Upgrade Program');
+  const { meta, smartWallet, lockerData, governor } = useGovernor();
+  const { ownerInvokerKey } = useExecutiveCouncil();
+
+  if (!smartWallet || !ownerInvokerKey) {
+    return <Spinner />;
+  }
+
+  const actor = smartWallet;
+  const ctx = { ...meta, locker: lockerData?.publicKey, governor };
+
+  const currentAction = ACTIONS.find(action => action.title === actionType);
+
+  return (
+    <Box display="grid" gap="4" htmlFor="proposedAction">
+      <Field label={<Text as="span">Proposed Action</Text>}>
+        <select
+          value={actionType}
+          onChange={e => {
+            setActionType(e.target.value as ActionType);
+            setError(null);
+            setTxRaw('');
+          }}
+        >
+          {ACTIONS.map(({ title, isEnabled }) => {
+            if (isEnabled && ctx && !isEnabled(ctx)) {
+              return null;
+            }
+            return (
+              <option key={title} value={title}>
+                {title}
+              </option>
+            );
+          })}
+        </select>
+      </Field>
+      {/* <label tw="flex flex-col gap-1" htmlFor="proposedAction">
+        <select
+          value={actionType}
+          onChange={e => {
+            setActionType(e.target.value as ActionType);
+            setError(null);
+            setTxRaw('');
+          }}
+        >
+          {ACTIONS.map(({ title, isEnabled }) => {
+            if (isEnabled && ctx && !isEnabled(ctx)) {
+              return null;
+            }
+            return (
+              <option key={title} value={title}>
+                {title}
+              </option>
+            );
+          })}
+        </select>
+      </label> */}
+      {currentAction && (
+        <>
+          {currentAction.description && (
+            <HelperCard>{currentAction.description}</HelperCard>
+          )}
+          <currentAction.Renderer
+            actor={actor}
+            payer={ownerInvokerKey}
+            ctx={ctx}
+            txRaw={txRaw}
+            setError={setError}
+            setTxRaw={setTxRaw}
+          />
+        </>
+      )}
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalCreateView/locked-voter/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/index.tsx
new file mode 100644
index 00000000..566ea4a1
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/locked-voter/index.tsx
@@ -0,0 +1,25 @@
+import { Card, Heading } from 'degen';
+import { useSDK } from 'helpers/sdk';
+// import { EmptyStateConnectWallet } from '../../../../../common/EmptyState';
+// import { Card } from '../../../../../common/governance/Card';
+// import { GovernancePage } from '../../../../../common/governance/GovernancePage';
+import { ProposalCreateInner } from './ProposalCreateInner';
+
+export const ProposalCreateView: React.FC = () => {
+  const { sdkMut } = useSDK();
+  return (
+    // <GovernancePage
+    //   title="Create a Proposal"
+    //   containerStyles={tw`w-11/12 md:w-full max-w-7xl mx-auto`}
+    // >
+    sdkMut ? (
+      <ProposalCreateInner />
+    ) : (
+      <Card>
+        <Heading>Proposal Info</Heading>
+        {/* <EmptyStateConnectWallet /> */}
+      </Card>
+    )
+    // </GovernancePage>
+  );
+};
diff --git a/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx b/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
new file mode 100644
index 00000000..5641a3c0
--- /dev/null
+++ b/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
@@ -0,0 +1,67 @@
+import { Box, Spinner } from 'degen';
+import BN from 'bn.js';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { formatNumberSI } from 'helpers/format';
+// import { Meter } from '../../../../../common/Meter';
+
+interface Props {
+  proposal: ProposalInfo;
+}
+
+export const ActiveProposalVotingBars: React.FC<Props> = ({
+  proposal
+}: Props) => {
+  const { veToken } = useGovernor();
+  if (!veToken) {
+    return <Spinner />;
+  }
+  const forVotes = proposal.proposalData.forVotes
+    .div(new BN(10 ** veToken.decimals))
+    .toNumber();
+  const againstVotes = proposal.proposalData.againstVotes
+    .div(new BN(10 ** veToken.decimals))
+    .toNumber();
+  const maxVotes = Math.max(forVotes, againstVotes, 1);
+  return (
+    <Box display="flex" flexDirection="column">
+      <Box
+        width="full"
+        display="flex"
+        alignItems="center"
+        height="6"
+        fontWeight="medium"
+        color="white"
+      >
+        {/* <div tw="w-full flex items-center gap-3 text-xs text-white font-medium h-6"> */}
+        {/* <Meter
+          value={forVotes}
+          max={maxVotes}
+          barColor={theme`colors.primary`}
+        /> */}
+        {/* <div tw="flex-basis[44px]"> */}
+        {formatNumberSI(forVotes)}
+        {/* </div> */}
+      </Box>
+      <Box
+        width="full"
+        display="flex"
+        alignItems="center"
+        height="6"
+        fontWeight="medium"
+        color="white"
+      >
+        {/* <div tw="w-full flex items-center gap-3 text-xs text-white font-medium h-6"> */}
+        {/* <Meter
+          value={againstVotes}
+          max={maxVotes}
+          barColor={theme`colors.red.500`}
+        /> */}
+        {/* <div tw="flex-basis[44px]"> */}
+        {formatNumberSI(againstVotes)}
+        {/* </div> */}
+      </Box>
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalsList/PageNav.tsx b/components/Proposals/ProposalsList/PageNav.tsx
new file mode 100644
index 00000000..93cc6558
--- /dev/null
+++ b/components/Proposals/ProposalsList/PageNav.tsx
@@ -0,0 +1,63 @@
+import { Box, Button, IconChevronLeft, IconChevronRight, Stack } from 'degen';
+
+interface Props {
+  numPages: number;
+  currentPage: number;
+  setCurrentPage: (page: number) => void;
+}
+
+export const PageNav: React.FC<Props> = (props: Props) => {
+  const { currentPage, setCurrentPage, numPages } = props;
+  return (
+    <>
+      <Box
+        display="flex"
+        alignItems="center"
+        justifyContent="space-between"
+        paddingX="7"
+        paddingY="3"
+      >
+        <Box width="20">
+          {currentPage !== 0 ? (
+            <Button
+              prefix={<IconChevronLeft />}
+              onClick={() => setCurrentPage(currentPage - 1)}
+              variant="transparent"
+            >
+              Prev
+            </Button>
+          ) : (
+            <div />
+          )}
+        </Box>
+        <Box aria-label="Page navigation" flexGrow={1}>
+          <Stack
+            justify="center"
+            align="center"
+            direction="horizontal"
+            //  tw="w-full justify-center flex gap-4 items-center"
+          >
+            {new Array(numPages).fill(null).map((_, i) => (
+              <li key={i}>
+                <button onClick={() => setCurrentPage(i)}>{i + 1}</button>
+              </li>
+            ))}
+          </Stack>
+        </Box>
+        <Box width="20" textAlign="right">
+          {currentPage !== numPages - 1 ? (
+            <Button
+              suffix={<IconChevronRight />}
+              variant="transparent"
+              onClick={() => setCurrentPage(currentPage + 1)}
+            >
+              Next
+            </Button>
+          ) : (
+            <div />
+          )}
+        </Box>
+      </Box>
+    </>
+  );
+};
diff --git a/components/Proposals/ProposalsList/PlaceholderCard.tsx b/components/Proposals/ProposalsList/PlaceholderCard.tsx
new file mode 100644
index 00000000..2d29223e
--- /dev/null
+++ b/components/Proposals/ProposalsList/PlaceholderCard.tsx
@@ -0,0 +1,39 @@
+import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { Box, Skeleton } from 'degen';
+import React from 'react';
+
+import { ProposalStateLabel } from './ProposalStateLabel';
+
+export const PlaceholderCard: React.FC = () => {
+  return (
+    <Box
+      display="flex"
+      alignItems="center"
+      justifyContent="space-between"
+      paddingX="6"
+      paddingY="7"
+      borderLeftWidth="2"
+      cursor="pointer"
+      borderColor="transparent"
+      borderBottomWidth="1"
+    >
+      <div>
+        <Box display="flex" alignItems="center" height="5">
+          <Skeleton loading height="3" backgroundColor="accentSecondary" />
+        </Box>
+        <PlaceholderSubtitle />
+      </div>
+    </Box>
+  );
+};
+
+export const PlaceholderSubtitle: React.FC = () => (
+  <Box display="flex" alignItems="center" marginTop="2" gap="2">
+    <ProposalStateLabel state={ProposalState.Draft} />
+    <Box display="flex" alignItems="center" gap="1">
+      <Skeleton loading height="2" width="4" />
+      <span>&middot;</span>
+      <Skeleton loading height="2" width="20" />
+    </Box>
+  </Box>
+);
diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
new file mode 100644
index 00000000..c717b353
--- /dev/null
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -0,0 +1,86 @@
+import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { Box, Text } from 'degen';
+import Link from 'next/link';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { PROPOSAL_TITLE_MAX_LEN } from 'helpers/sdk/constant';
+import { ActiveProposalVotingBars } from './ActiveProposalVotingBars';
+import { ProposalStateBadge } from './ProposalStateBadge';
+import { ProposalStateDate } from './ProposalStateDate';
+import { ProposalStateLabel } from './ProposalStateLabel';
+import { PulsingDot } from 'icons/PulsingDot';
+
+interface Props {
+  proposalInfo: ProposalInfo;
+}
+
+export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
+  const { path } = useGovernor();
+  const { state, executed } = proposalInfo.status;
+  return (
+    <Link
+      href={`${path}/proposals/${proposalInfo.index}`}
+      passHref
+      // tw="flex items-center justify-between py-5 px-6 border-l-2 border-l-transparent border-b border-b-warmGray-800 cursor-pointer hover:border-l-primary"
+    >
+      <Box
+        display="flex"
+        alignItems="center"
+        gap="5"
+        width={{ md: '192', xs: '3/4' }}
+        // tw="flex items-center gap-5 w-3/4 md:w-[500px]"
+      >
+        {state === ProposalState.Active && <PulsingDot color="decendent" />}
+        <div>
+          <Box display="flex" alignItems="center">
+            <Text
+              color="white"
+              lineHeight="1.375"
+              // tw="text-white leading-snug break-words hyphens[auto]"
+            >
+              {proposalInfo.proposalMetaData?.title.slice(
+                0,
+                PROPOSAL_TITLE_MAX_LEN
+              )}
+            </Text>
+          </Box>
+          {proposalInfo.proposalData && state !== null && (
+            <Box
+              display="flex"
+              flexDirection={{ md: 'row', xs: 'column' }}
+              alignItems={{ md: 'center' }}
+              marginTop={{ md: '4', xs: '2' }}
+              gap="2"
+              // tw="flex flex-col mt-4 gap-2 md:(flex-row items-center mt-2)"
+            >
+              <ProposalStateLabel state={state} executed={executed} />
+              <Box
+                display="flex"
+                gap="1"
+                fontSize="small"
+                fontWeight="semiBold"
+              >
+                <span>{`000${proposalInfo.index}`.slice(-4)}</span>
+                <span>&middot;</span>
+                <ProposalStateDate proposalInfo={proposalInfo} />
+              </Box>
+            </Box>
+          )}
+        </div>
+      </Box>
+      {state === ProposalState.Active && (
+        <Box width="192">
+          <ActiveProposalVotingBars proposal={proposalInfo} />
+        </Box>
+      )}
+      {state !== null &&
+        state !== ProposalState.Draft &&
+        state !== ProposalState.Active && (
+          <Box width={{ sm: '16', md: '20', lg: '40' }}>
+            <ProposalStateBadge status={proposalInfo.status} />
+          </Box>
+        )}
+    </Link>
+  );
+};
diff --git a/components/Proposals/ProposalsList/ProposalStateBadge.tsx b/components/Proposals/ProposalsList/ProposalStateBadge.tsx
new file mode 100644
index 00000000..caef46c2
--- /dev/null
+++ b/components/Proposals/ProposalsList/ProposalStateBadge.tsx
@@ -0,0 +1,59 @@
+import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { startCase } from 'lodash';
+import { IconCheck, IconPencil, IconClose, IconRefresh } from 'degen';
+import type { ProposalStatus } from 'hooks/tribeca/useProposals';
+
+interface Props {
+  status: ProposalStatus;
+}
+
+const STATE_LABELS: { [K in ProposalState]: string } = {
+  [ProposalState.Active]: 'active',
+  [ProposalState.Draft]: 'draft',
+  [ProposalState.Canceled]: 'canceled',
+  [ProposalState.Defeated]: 'failed',
+  [ProposalState.Succeeded]: 'passed',
+  [ProposalState.Queued]: 'queued'
+};
+
+const getStateIcon = (state: ProposalState): React.ReactNode => {
+  switch (state) {
+    case ProposalState.Active:
+      return (
+        <div tw="bg-accent text-white h-6 w-6 rounded-full flex items-center justify-center">
+          <IconRefresh />
+        </div>
+      );
+    case ProposalState.Canceled:
+    case ProposalState.Defeated:
+      return (
+        <div tw="bg-gray-500 text-white h-6 w-6 rounded-full flex items-center justify-center">
+          <IconClose />
+        </div>
+      );
+    case ProposalState.Draft:
+      return (
+        <div tw="bg-gray-500 text-white h-6 w-6 rounded-full flex items-center justify-center">
+          <IconPencil />
+        </div>
+      );
+    default:
+      return (
+        <div tw="bg-primary text-white h-6 w-6 rounded-full flex items-center justify-center">
+          <IconCheck />
+        </div>
+      );
+  }
+};
+
+export const ProposalStateBadge: React.FC<Props> = ({ status }: Props) => {
+  const { executed, state } = status;
+  return (
+    <div tw="flex flex-col items-center gap-1 lg:(flex-row gap-5)">
+      {getStateIcon(state)}
+      <span tw="text-xs md:text-sm text-white">
+        {startCase(executed ? 'executed' : STATE_LABELS[state])}
+      </span>
+    </div>
+  );
+};
diff --git a/components/Proposals/ProposalsList/ProposalStateDate.tsx b/components/Proposals/ProposalsList/ProposalStateDate.tsx
new file mode 100644
index 00000000..bcc26ed5
--- /dev/null
+++ b/components/Proposals/ProposalsList/ProposalStateDate.tsx
@@ -0,0 +1,72 @@
+import type { ProposalData } from "@tribecahq/tribeca-sdk";
+import { ProposalState } from "@tribecahq/tribeca-sdk";
+import type BN from "bn.js";
+import Countdown from "react-countdown";
+
+import type {
+  ProposalInfo,
+  ProposalStatus,
+} from "../../../../../../hooks/tribeca/useProposals";
+
+interface Props {
+  proposalInfo: ProposalInfo;
+}
+
+const STATE_LABELS: { [K in ProposalState]: string } = {
+  [ProposalState.Active]: "Voting ends",
+  [ProposalState.Draft]: "Created",
+  [ProposalState.Canceled]: "Canceled",
+  [ProposalState.Defeated]: "Failed",
+  [ProposalState.Succeeded]: "Passed",
+  [ProposalState.Queued]: "Queued",
+};
+
+export const stateToDateSeconds = (
+  proposal: ProposalData,
+  status: ProposalStatus
+): BN | null => {
+  if (status.executed) {
+    return status.executionTime;
+  }
+
+  switch (status.state) {
+    case ProposalState.Active:
+      return proposal.votingEndsAt;
+    case ProposalState.Canceled:
+      return null;
+    case ProposalState.Defeated:
+    case ProposalState.Succeeded:
+      return proposal.votingEndsAt;
+    case ProposalState.Draft:
+      return proposal.createdAt;
+    case ProposalState.Queued:
+      return proposal.queuedAt;
+  }
+};
+
+export const ProposalStateDate: React.FC<Props> = ({ proposalInfo }: Props) => {
+  const { status, proposalData } = proposalInfo;
+  const { executed, state } = status;
+  const dateSeconds = stateToDateSeconds(proposalData, status);
+  const date = dateSeconds ? new Date(dateSeconds.toNumber() * 1_000) : null;
+  return (
+    <span>
+      {executed ? "Executed" : STATE_LABELS[state]}{" "}
+      {state === ProposalState.Active ? (
+        date ? (
+          <>
+            in <Countdown date={date} />
+          </>
+        ) : (
+          "--"
+        )
+      ) : (
+        date?.toLocaleDateString(undefined, {
+          month: "long",
+          day: "numeric",
+          year: "numeric",
+        })
+      )}
+    </span>
+  );
+};
diff --git a/components/Proposals/ProposalsList/ProposalStateLabel.tsx b/components/Proposals/ProposalsList/ProposalStateLabel.tsx
new file mode 100644
index 00000000..6be607f9
--- /dev/null
+++ b/components/Proposals/ProposalsList/ProposalStateLabel.tsx
@@ -0,0 +1,43 @@
+import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { Text } from 'degen';
+import { startCase } from 'lodash';
+
+interface Props {
+  state: ProposalState;
+  executed?: boolean;
+}
+
+const STATE_LABELS: { [K in ProposalState]: string } = {
+  [ProposalState.Active]: 'active',
+  [ProposalState.Draft]: 'draft',
+  [ProposalState.Canceled]: 'canceled',
+  [ProposalState.Defeated]: 'failed',
+  [ProposalState.Succeeded]: 'passed',
+  [ProposalState.Queued]: 'queued'
+};
+
+export const ProposalStateLabel: React.FC<Props> = ({
+  state,
+  executed
+}: Props) => {
+  return (
+    <Text
+      size="small"
+      align="center"
+      // css={[
+      //   tw`text-xs border rounded py-0.5 w-16 flex items-center justify-center`,
+      //   (state === ProposalState.Canceled ||
+      //     state === ProposalState.Defeated ||
+      //     state === ProposalState.Draft) &&
+      //     tw`border-gray-500 text-gray-500`,
+      //   (executed ||
+      //     state === ProposalState.Succeeded ||
+      //     state === ProposalState.Queued) &&
+      //     tw`border-primary text-primary`,
+      //   state === ProposalState.Active && tw`border-accent text-accent`
+      // ]}
+    >
+      {startCase(executed ? 'executed' : STATE_LABELS[state])}
+    </Text>
+  );
+};
diff --git a/components/Proposals/ProposalsList/ProposalSubtitle.tsx b/components/Proposals/ProposalsList/ProposalSubtitle.tsx
new file mode 100644
index 00000000..384c548e
--- /dev/null
+++ b/components/Proposals/ProposalsList/ProposalSubtitle.tsx
@@ -0,0 +1,32 @@
+import { Box } from 'degen';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { ProposalStateDate } from './ProposalStateDate';
+import { ProposalStateLabel } from './ProposalStateLabel';
+
+interface Props {
+  className?: string;
+  proposalInfo: ProposalInfo;
+}
+
+export const ProposalSubtitle: React.FC<Props> = ({
+  proposalInfo,
+  className
+}: Props) => {
+  const { state, executed } = proposalInfo.status;
+  return (
+    <Box
+      display="flex"
+      alignItems="center"
+      gap="2"
+      marginTop="2"
+      className={className}
+    >
+      <ProposalStateLabel state={state} executed={executed} />
+      <Box display="flex" gap="1" fontSize="small" fontWeight="semiBold">
+        <span>{`000${proposalInfo.index}`.slice(-4)}</span>
+        <span>&middot;</span>
+        <ProposalStateDate proposalInfo={proposalInfo} />
+      </Box>
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalsList/index.tsx b/components/Proposals/ProposalsList/index.tsx
new file mode 100644
index 00000000..cb31f7c0
--- /dev/null
+++ b/components/Proposals/ProposalsList/index.tsx
@@ -0,0 +1,142 @@
+import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { useState } from 'react';
+import Link from 'next/link';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { useProposals } from 'hooks/tribeca/useProposals';
+import { PageNav } from './PageNav';
+import { PlaceholderCard } from './PlaceholderCard';
+import { ProposalCard } from './ProposalCard';
+import { Box, Text } from 'degen';
+
+const NUM_PLACEHOLDERS = 0;
+const PROPOSALS_PER_PAGE = 20;
+
+interface EmptyStateProps {
+  icon?: React.ReactNode;
+  title: string;
+  children?: React.ReactNode;
+  className?: string;
+}
+
+const EmptyState: React.FC<EmptyStateProps> = ({
+  icon,
+  title,
+  children,
+  className
+}) => {
+  return (
+    <Box
+      width="full"
+      paddingY="12"
+      display="flex"
+      flexDirection="column"
+      alignItems="center"
+      // tw="w-full py-12 text-sm flex flex-col items-center"
+      className={className}
+    >
+      {icon && (
+        <div
+        // tw="w-20 h-20 mb-3"
+        // css={css`
+        //   & > svg,
+        //   & > img {
+        //     ${tw`w-full h-full text-gray-300`}
+        //   }
+        // `}
+        >
+          {icon}
+        </div>
+      )}
+      <div className="h-6">
+        <Text>{title}</Text>
+      </div>
+      <div>{children}</div>
+    </Box>
+  );
+};
+
+interface Props {
+  maxCount?: number;
+  showDrafts?: boolean;
+}
+
+export const ProposalsList: React.FC<Props> = ({
+  maxCount = 9_999_999,
+  showDrafts = false
+}: Props) => {
+  const { proposalCount } = useGovernor();
+  const proposals = useProposals();
+  const [currentPage, setCurrentPage] = useState(0);
+
+  const allProposals = [
+    ...proposals,
+    ...new Array<null>(NUM_PLACEHOLDERS).fill(null)
+  ]
+    .filter(p => {
+      const proposalState = p?.data?.status.state;
+      return showDrafts
+        ? true
+        : proposalState !== ProposalState.Draft &&
+            proposalState !== ProposalState.Canceled;
+    })
+    .slice(0, maxCount);
+
+  const startCursor = currentPage * PROPOSALS_PER_PAGE;
+
+  if (typeof proposalCount !== 'number') {
+    return (
+      <>
+        {Array(Math.min(PROPOSALS_PER_PAGE, maxCount))
+          .fill(null)
+          .map((_, i) => (
+            <PlaceholderCard key={i} />
+          ))}
+      </>
+    );
+  }
+
+  if (proposalCount === 0 || allProposals.length === 0) {
+    return (
+      <div>
+        <EmptyState title="There aren't any proposals yet.">
+          <Text>
+            <Link href={`proposals/create`} passHref>
+              Create a proposal
+            </Link>
+          </Text>
+        </EmptyState>
+      </div>
+    );
+  }
+
+  const pageCount = calcPageTotal(allProposals.length ?? 0);
+  return (
+    <>
+      {allProposals
+        .slice(startCursor, startCursor + PROPOSALS_PER_PAGE)
+        .map((proposal, i) =>
+          proposal && proposal.data ? (
+            <ProposalCard
+              key={proposal.data.proposalKey.toString()}
+              proposalInfo={proposal.data}
+            />
+          ) : (
+            <PlaceholderCard key={i} />
+          )
+        )}
+      {pageCount > 1 && (
+        <PageNav
+          currentPage={currentPage}
+          setCurrentPage={setCurrentPage}
+          numPages={pageCount}
+        />
+      )}
+    </>
+  );
+};
+
+const calcPageTotal = (numProposals: number): number => {
+  const div = Math.floor(numProposals / PROPOSALS_PER_PAGE);
+  return div + (numProposals % PROPOSALS_PER_PAGE ? 1 : 0);
+};
diff --git a/helpers/constants.ts b/helpers/constants.ts
new file mode 100644
index 00000000..532a64b9
--- /dev/null
+++ b/helpers/constants.ts
@@ -0,0 +1,9 @@
+import { PublicKey } from '@solana/web3.js';
+
+export const TX_REFETCH_TIME = 1_000;
+
+export const MEMO_PROGRAM_ID = new PublicKey(
+  'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr'
+);
+
+export const PROPOSAL_TITLE_MAX_LEN = 140;
diff --git a/helpers/currencies.ts b/helpers/currencies.ts
new file mode 100644
index 00000000..ed8185f3
--- /dev/null
+++ b/helpers/currencies.ts
@@ -0,0 +1,105 @@
+import type { Token } from '@saberhq/token-utils';
+import { mapValues } from 'lodash';
+
+/**
+ * A market
+ */
+export enum CurrencyMarket {
+  USD = 'USD',
+  BTC = 'BTC',
+  LUNA = 'LUNA',
+  FTT = 'FTT',
+  SRM = 'SRM',
+  SOL = 'SOL'
+}
+
+export const getMarketTag = (market: CurrencyMarket): string =>
+  `saber-market-${market.toString().toLocaleLowerCase()}`;
+
+export const CURRENCY_MARKET_TAGS: { [C in CurrencyMarket]: string } =
+  mapValues(CurrencyMarket, value => getMarketTag(value));
+
+export const getMarketFromTag = (tag: string): CurrencyMarket | null => {
+  return (
+    (Object.entries(CURRENCY_MARKET_TAGS).find(
+      ([_, v]) => v === tag
+    )?.[0] as CurrencyMarket) ?? null
+  );
+};
+
+export const getMarket = (token: Token): CurrencyMarket => {
+  const marketTag = token.info.tags?.find(tag =>
+    tag.startsWith('saber-market-')
+  );
+  if (!marketTag) {
+    return CurrencyMarket.USD;
+  }
+  return getMarketFromTag(marketTag) ?? CurrencyMarket.USD;
+};
+
+export const getMarketIfExists = (token: Token): CurrencyMarket | null => {
+  const marketTag = token.info.tags?.find(tag =>
+    tag.startsWith('saber-market-')
+  );
+  if (!marketTag) {
+    return null;
+  }
+  return getMarketFromTag(marketTag) ?? null;
+};
+
+/**
+ * Default options for formatting the currency in large amounts.
+ */
+export const CURRENCY_INFO: {
+  [C in CurrencyMarket]: {
+    name: string;
+    symbol: string;
+    prefix?: string;
+    largeFormat: Intl.NumberFormat;
+  };
+} = {
+  USD: {
+    name: 'Stablecoin',
+    symbol: 'USD',
+    prefix: '%',
+    largeFormat: new Intl.NumberFormat(undefined, {
+      maximumFractionDigits: 0
+    })
+  },
+  BTC: {
+    name: 'Bitcoin',
+    symbol: 'BTC',
+    prefix: '₿',
+    largeFormat: new Intl.NumberFormat(undefined, {
+      maximumFractionDigits: 8
+    })
+  },
+  LUNA: {
+    name: 'Luna',
+    symbol: 'LUNA',
+    largeFormat: new Intl.NumberFormat(undefined, {
+      maximumFractionDigits: 2
+    })
+  },
+  FTT: {
+    name: 'FTT',
+    symbol: 'FTT',
+    largeFormat: new Intl.NumberFormat(undefined, {
+      maximumFractionDigits: 4
+    })
+  },
+  SRM: {
+    name: 'SRM',
+    symbol: 'SRM',
+    largeFormat: new Intl.NumberFormat(undefined, {
+      maximumFractionDigits: 3
+    })
+  },
+  SOL: {
+    name: 'SOL',
+    symbol: 'SOL',
+    largeFormat: new Intl.NumberFormat(undefined, {
+      maximumFractionDigits: 3
+    })
+  }
+};
diff --git a/helpers/fetchers.ts b/helpers/fetchers.ts
new file mode 100644
index 00000000..5b9c3b9d
--- /dev/null
+++ b/helpers/fetchers.ts
@@ -0,0 +1,28 @@
+import type { Idl } from '@project-serum/anchor';
+import { Program } from '@project-serum/anchor';
+import { makeAnchorProvider } from '@saberhq/anchor-contrib';
+import { fetchNullableWithSessionCache } from '@saberhq/sail';
+import { SignerWallet, SolanaProvider } from '@saberhq/solana-contrib';
+import type { Connection } from '@solana/web3.js';
+import { Keypair, PublicKey } from '@solana/web3.js';
+
+export const fetchIDL = async (
+  connection: Connection,
+  address: string
+): Promise<Idl | null> => {
+  const response = await fetchNullableWithSessionCache<Idl>(
+    `https://raw.githubusercontent.com/DeployDAO/solana-program-index/master/idls/${address}.json`
+  );
+  if (response === null) {
+    return await Program.fetchIdl(
+      new PublicKey(address),
+      makeAnchorProvider(
+        SolanaProvider.init({
+          connection,
+          wallet: new SignerWallet(Keypair.generate())
+        })
+      )
+    );
+  }
+  return response;
+};
diff --git a/helpers/format.ts b/helpers/format.ts
new file mode 100644
index 00000000..a9433a03
--- /dev/null
+++ b/helpers/format.ts
@@ -0,0 +1,249 @@
+import { Fraction, Percent, ZERO } from "@saberhq/token-utils";
+import formatDuration from "date-fns/formatDuration";
+import intervalToDuration from "date-fns/intervalToDuration";
+import JSBI from "jsbi";
+
+import { CURRENCY_INFO, CurrencyMarket } from "./currencies";
+
+export const DATE_FORMATTER = new Intl.DateTimeFormat(undefined, {
+  month: "short",
+  day: "numeric",
+  year: "numeric",
+  hour: "numeric",
+  minute: "numeric",
+  second: "numeric",
+  timeZoneName: "short",
+});
+
+export const FORMAT_PERCENT: Intl.NumberFormatOptions = {
+  minimumFractionDigits: 2,
+  maximumFractionDigits: 5,
+  style: "percent",
+};
+
+export const FORMAT_VOTE_PERCENT = new Intl.NumberFormat(undefined, {
+  maximumFractionDigits: 2,
+  style: "percent",
+});
+
+export const fractionToFloat = (frac: Fraction): number => {
+  if (JSBI.equal(frac.denominator, ZERO)) {
+    return JSBI.greaterThan(frac.numerator, ZERO)
+      ? Number.POSITIVE_INFINITY
+      : JSBI.lessThan(frac.numerator, ZERO)
+      ? Number.NEGATIVE_INFINITY
+      : Number.NaN;
+  }
+  return parseFloat(frac.toFixed(10));
+};
+
+const ONE_BP = new Percent(1, 10_000);
+
+export const formatPercent = (percent: Percent): string => {
+  return percent.lessThan(ONE_BP)
+    ? `${percent.toSignificant()}%`
+    : fractionToFloat(percent.asFraction).toLocaleString(
+        undefined,
+        FORMAT_PERCENT
+      );
+};
+
+export const formatPrecise = (percent: Percent): string => {
+  return (fractionToFloat(percent.asFraction) * 100).toLocaleString(undefined, {
+    maximumFractionDigits: 10,
+  });
+};
+
+export const FORMAT_DOLLARS: Intl.NumberFormatOptions = {
+  currency: "USD",
+  style: "currency",
+};
+
+export const FORMAT_DOLLARS_WHOLE: Intl.NumberFormatOptions = {
+  currency: "USD",
+  style: "currency",
+  minimumFractionDigits: 0,
+  maximumFractionDigits: 0,
+};
+
+export const formatCurrency = (
+  amount: number,
+  currency: CurrencyMarket,
+  numberFormatOptions: Intl.NumberFormatOptions = {}
+): string => {
+  if (currency === CurrencyMarket.USD) {
+    return amount.toLocaleString(undefined, {
+      ...FORMAT_DOLLARS,
+      ...numberFormatOptions,
+    });
+  }
+  const fmt = amount.toLocaleString(undefined, {
+    minimumSignificantDigits: 4,
+    ...numberFormatOptions,
+  });
+  const info = CURRENCY_INFO[currency];
+  const prefix = info.prefix;
+  if (prefix) {
+    return `${prefix}${fmt}`;
+  }
+  return `${fmt} ${info.symbol}`;
+};
+
+export const formatCurrencyWhole = (
+  amount: number,
+  currency: CurrencyMarket,
+  numberFormatOptions: Intl.NumberFormatOptions = {}
+): string => {
+  if (currency === CurrencyMarket.USD) {
+    return amount.toLocaleString(undefined, {
+      ...FORMAT_DOLLARS_WHOLE,
+      ...numberFormatOptions,
+    });
+  }
+  const fmt = amount.toLocaleString(undefined, {
+    minimumFractionDigits: 0,
+    maximumFractionDigits: 0,
+    ...numberFormatOptions,
+  });
+  const info = CURRENCY_INFO[currency];
+  const prefix = info.prefix;
+  if (prefix) {
+    return `${prefix}${fmt}`;
+  }
+  return `${fmt} ${info.symbol}`;
+};
+
+export const formatCurrencySmart = (
+  amount: number | Fraction,
+  currency: CurrencyMarket,
+  numberFormatOptions?: Intl.NumberFormatOptions
+): string => {
+  const amtFloat =
+    amount instanceof Fraction ||
+    (typeof amount === "object" && (amount as Record<string, unknown>)?.toFixed)
+      ? fractionToFloat(amount)
+      : amount;
+  const threshold =
+    currency === CurrencyMarket.USD
+      ? 100
+      : currency === CurrencyMarket.BTC
+      ? 100
+      : 1;
+  return amtFloat > threshold
+    ? formatCurrencyWhole(amtFloat, currency, numberFormatOptions)
+    : formatCurrency(amtFloat, currency, numberFormatOptions);
+};
+
+/**
+ * @warning For end-user display purposes only. It loses precision and does rounding
+ *
+ * There is padding
+ *
+ * If (Whole number digits > softMaximumSignificantDigits)
+ *   Rounds to whole number towards 0
+ * Otherwise
+ *   Defaults to token.decimals, but respects numberFormatOptions as an override
+ *
+ * Example for softMaximumSignificantDigits = 7 and token with 6 maxDigits
+ *
+ * 1234.87654321 => 1234.876 (7 significant figures)
+ * 1234567.87654321 => 1234567 (rounded down)
+ * 123456789.321 => 123456789
+ * 1.87654321 => 1.876543
+ */
+export const formatDisplayWithSoftLimit = (
+  float: number,
+  maxDecimals: number,
+  softMaximumSignificantDigits = 7,
+  numberFormatOptions?: Intl.NumberFormatOptions,
+  locale?: string
+): string => {
+  if (
+    Number.isNaN(softMaximumSignificantDigits) ||
+    softMaximumSignificantDigits <= 0
+  ) {
+    throw new Error("softMaximumSignificantDigits must be greater than 0");
+  }
+
+  // Round to integer if there are enough whole digits
+  const dropDecimalsAfter = Math.pow(10, softMaximumSignificantDigits - 1);
+
+  if (float >= dropDecimalsAfter) {
+    // Round down to display integer amount
+    const wholeNumberFormatOptions: Intl.NumberFormatOptions = Object.assign(
+      {},
+      numberFormatOptions,
+      {
+        maximumFractionDigits: 0,
+      }
+    );
+    return Math.floor(float).toLocaleString(locale, wholeNumberFormatOptions);
+  }
+
+  // Round to maxDecimals if too small
+  const sigDerivedDigitsOnRight =
+    softMaximumSignificantDigits - Math.floor(Math.log10(float)) - 1;
+
+  const digitsOnRight = Math.max(
+    0,
+    Math.min(maxDecimals, sigDerivedDigitsOnRight)
+  );
+  const flooredToPrecision =
+    Math.floor(float * 10 ** digitsOnRight) / 10 ** digitsOnRight;
+
+  const maxFormatOptions: Intl.NumberFormatOptions = Object.assign(
+    {
+      minimumFractionDigits: digitsOnRight,
+      maximumFractionDigits: digitsOnRight,
+    },
+    numberFormatOptions
+  );
+  return flooredToPrecision.toLocaleString(locale, maxFormatOptions);
+};
+
+const SI_SUFFIXES = {
+  t: 12,
+  b: 9,
+  m: 6,
+  k: 3,
+};
+
+export const formatNumberSI = (value: number): string => {
+  const result = Object.entries(SI_SUFFIXES).find(([_, power]) => {
+    return value >= 10 ** power;
+  });
+  if (!result) {
+    return value.toLocaleString();
+  }
+  const [suffix, power] = result;
+  const adjusted = value / 10 ** power;
+  return `${adjusted.toLocaleString(undefined, {
+    maximumSignificantDigits: 3,
+  })}${suffix}`;
+};
+
+export const formatDurationSeconds = (seconds: number) =>
+  formatDuration(
+    intervalToDuration({
+      start: new Date(0),
+      end: new Date(seconds * 1_000),
+    }),
+    { delimiter: ", " }
+  );
+
+export const formatSignificantDistance = (end: Date, start: Date) =>
+  formatDuration(
+    intervalToDuration({
+      start,
+      end,
+    }),
+    { delimiter: ", " }
+  )
+    .split(", ")
+    .slice(0, 3)
+    .join(", ");
+
+export const formatSignificantDistanceWithSuffix = (end: Date, start: Date) => {
+  const fmt = formatSignificantDistance(end, start);
+  return `${fmt} ${end < start ? "after" : "before"}`;
+};
diff --git a/helpers/idl/ve_honey.json b/helpers/idl/ve_honey.json
index 1592ece9..6a881173 100644
--- a/helpers/idl/ve_honey.json
+++ b/helpers/idl/ve_honey.json
@@ -44,6 +44,29 @@
         }
       ]
     },
+    {
+      "name": "setLockerParams",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "params",
+          "type": {
+            "defined": "LockerParams"
+          }
+        }
+      ]
+    },
     {
       "name": "initEscrow",
       "accounts": [
@@ -54,7 +77,397 @@
         },
         {
           "name": "locker",
-          "isMut": true,
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "approveProgramLockPrivilege",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "lockerAdmin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "whitelistEntry",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "executableId",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "whitelistedOwner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "revokeProgramLockPrivilege",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "lockerAdmin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "whitelistEntry",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "executableId",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "lock",
+      "accounts": [
+        {
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "lockedTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "sourceTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "sourceTokensAuthority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "amount",
+          "type": "u64"
+        },
+        {
+          "name": "duration",
+          "type": "i64"
+        }
+      ]
+    },
+    {
+      "name": "exit",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "lockedTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "destinationTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "migrateLocker",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "base",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "newBase",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "newLocker",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "smartWallet",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "proposalActivationMinVotes",
+          "type": "u64"
+        }
+      ]
+    },
+    {
+      "name": "migrateEscrow",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "lockerAdmin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "oldLocker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "newLocker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "oldEscrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "newEscrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "oldLockedTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "newLockedTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "migrateWhitelist",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "oldLocker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "newLocker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "lockerAdmin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "whitelistEntry",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "newWhitelistEntry",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "initLockerV2",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "base",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenMint",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "params",
+          "type": {
+            "defined": "LockerParamsV2"
+          }
+        }
+      ]
+    },
+    {
+      "name": "initEscrowV2",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": false,
           "isSigner": false
         },
         {
@@ -76,28 +489,61 @@
       "args": []
     },
     {
-      "name": "approveProgramLockPrivilege",
+      "name": "setLockerParamsV2",
       "accounts": [
         {
-          "name": "payer",
+          "name": "locker",
           "isMut": true,
-          "isSigner": true
+          "isSigner": false
         },
         {
-          "name": "locker",
+          "name": "governor",
           "isMut": false,
           "isSigner": false
         },
         {
-          "name": "lockerAdmin",
+          "name": "smartWallet",
           "isMut": false,
           "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "params",
+          "type": {
+            "defined": "LockerParamsV2"
+          }
+        }
+      ]
+    },
+    {
+      "name": "approveProgramLockPrivilegeV2",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
         },
         {
           "name": "whitelistEntry",
           "isMut": true,
           "isSigner": false
         },
+        {
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "smartWallet",
+          "isMut": false,
+          "isSigner": true
+        },
         {
           "name": "executableId",
           "isMut": false,
@@ -117,7 +563,7 @@
       "args": []
     },
     {
-      "name": "revokeProgramLockPrivilege",
+      "name": "revokeProgramLockPrivilegeV2",
       "accounts": [
         {
           "name": "payer",
@@ -129,26 +575,26 @@
           "isMut": false,
           "isSigner": false
         },
-        {
-          "name": "lockerAdmin",
-          "isMut": false,
-          "isSigner": true
-        },
         {
           "name": "whitelistEntry",
           "isMut": true,
           "isSigner": false
         },
         {
-          "name": "executableId",
+          "name": "governor",
           "isMut": false,
           "isSigner": false
+        },
+        {
+          "name": "smartWallet",
+          "isMut": false,
+          "isSigner": true
         }
       ],
       "args": []
     },
     {
-      "name": "lock",
+      "name": "lockV2",
       "accounts": [
         {
           "name": "locker",
@@ -198,7 +644,7 @@
       ]
     },
     {
-      "name": "exit",
+      "name": "exitV2",
       "accounts": [
         {
           "name": "payer",
@@ -237,6 +683,88 @@
         }
       ],
       "args": []
+    },
+    {
+      "name": "activateProposal",
+      "accounts": [
+        {
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "proposal",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrow",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "governProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "castVote",
+      "accounts": [
+        {
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "escrow",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "voteDelegate",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "proposal",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "vote",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "governProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "side",
+          "type": "u8"
+        }
+      ]
     }
   ],
   "accounts": [
@@ -276,6 +804,46 @@
         ]
       }
     },
+    {
+      "name": "EscrowV2",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "locker",
+            "type": "publicKey"
+          },
+          {
+            "name": "owner",
+            "type": "publicKey"
+          },
+          {
+            "name": "bump",
+            "type": "u8"
+          },
+          {
+            "name": "tokens",
+            "type": "publicKey"
+          },
+          {
+            "name": "amount",
+            "type": "u64"
+          },
+          {
+            "name": "escrowStartedAt",
+            "type": "i64"
+          },
+          {
+            "name": "escrowEndsAt",
+            "type": "i64"
+          },
+          {
+            "name": "voteDelegate",
+            "type": "publicKey"
+          }
+        ]
+      }
+    },
     {
       "name": "Locker",
       "type": {
@@ -310,6 +878,40 @@
         ]
       }
     },
+    {
+      "name": "LockerV2",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "base",
+            "type": "publicKey"
+          },
+          {
+            "name": "bump",
+            "type": "u8"
+          },
+          {
+            "name": "tokenMint",
+            "type": "publicKey"
+          },
+          {
+            "name": "lockedSupply",
+            "type": "u64"
+          },
+          {
+            "name": "governor",
+            "type": "publicKey"
+          },
+          {
+            "name": "params",
+            "type": {
+              "defined": "LockerParamsV2"
+            }
+          }
+        ]
+      }
+    },
     {
       "name": "WhitelistEntry",
       "type": {
@@ -359,6 +961,34 @@
           }
         ]
       }
+    },
+    {
+      "name": "LockerParamsV2",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "minStakeDuration",
+            "type": "u64"
+          },
+          {
+            "name": "maxStakeDuration",
+            "type": "u64"
+          },
+          {
+            "name": "proposalActivationMinVotes",
+            "type": "u64"
+          },
+          {
+            "name": "whitelistEnabled",
+            "type": "bool"
+          },
+          {
+            "name": "multiplier",
+            "type": "u8"
+          }
+        ]
+      }
     }
   ],
   "events": [
@@ -444,6 +1074,33 @@
         }
       ]
     },
+    {
+      "name": "InitLockerV2Event",
+      "fields": [
+        {
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "tokenMint",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "governor",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "params",
+          "type": {
+            "defined": "LockerParamsV2"
+          },
+          "index": false
+        }
+      ]
+    },
     {
       "name": "LockEvent",
       "fields": [
@@ -600,6 +1257,26 @@
       "code": 6011,
       "name": "EscrowNoBalance",
       "msg": "The escrow doesn't have balance"
+    },
+    {
+      "code": 6012,
+      "name": "ProposalMustBeActive",
+      "msg": "The proposal must be active"
+    },
+    {
+      "code": 6013,
+      "name": "GovernorMismatch",
+      "msg": "Governor mismatch"
+    },
+    {
+      "code": 6014,
+      "name": "ProgramIdMustBeExecutable",
+      "msg": "Program id must be executable"
+    },
+    {
+      "code": 6015,
+      "name": "InsufficientVotingPower",
+      "msg": "Insufficient voting power to activate a proposal"
     }
   ]
 }
diff --git a/helpers/instructions/parseNonAnchorInstruction.ts b/helpers/instructions/parseNonAnchorInstruction.ts
new file mode 100644
index 00000000..08c9f86e
--- /dev/null
+++ b/helpers/instructions/parseNonAnchorInstruction.ts
@@ -0,0 +1,145 @@
+import { extractErrorMessage } from "@saberhq/sail";
+import { TOKEN_PROGRAM_ID } from "@saberhq/token-utils";
+import type {
+  CreateAccountParams,
+  SystemInstructionType,
+  TransactionInstruction,
+  TransferParams,
+  WithdrawNonceParams,
+} from "@solana/web3.js";
+import { SystemInstruction, SystemProgram } from "@solana/web3.js";
+import { startCase } from "lodash";
+import type { Infer } from "superstruct";
+import { any, string, type } from "superstruct";
+
+import { MEMO_PROGRAM_ID } from "../constants";
+import type { TokenInstructionInner } from "./token/parsers";
+import { parseTokenInstruction } from "./token/parsers";
+import type { TokenInstructionType } from "./token/types";
+import { IX_TITLES } from "./token/types";
+import { BPF_UPGRADEABLE_LOADER_ID } from "./upgradeable_loader/instructions";
+import type { UpgradeableLoaderInstructionType } from "./upgradeable_loader/parsers";
+import { parseUpgradeableLoaderInstruction } from "./upgradeable_loader/parsers";
+
+export type MemoInstruction = {
+  program: "memo";
+  text: string;
+};
+
+export type TokenInstruction<
+  K extends TokenInstructionType = TokenInstructionType
+> = TokenInstructionInner & {
+  program: "token";
+  type: K;
+};
+
+export type UpgradeableLoaderInstruction = {
+  program: "upgradeable_loader";
+  type: UpgradeableLoaderInstructionType;
+};
+
+export type SystemProgramInstruction = {
+  program: "system";
+  type: SystemInstructionType;
+  decoded: TransferParams | CreateAccountParams | WithdrawNonceParams | null;
+};
+
+type ParsedNonAnchorInstructionInner =
+  | MemoInstruction
+  | TokenInstruction
+  | UpgradeableLoaderInstruction
+  | SystemProgramInstruction;
+
+export type ParsedNonAnchorInstruction<
+  T extends ParsedNonAnchorInstructionInner = ParsedNonAnchorInstructionInner
+> = T & {
+  name: string;
+  accountLabels?: string[];
+};
+
+type IXParser = (ix: TransactionInstruction) => ParsedNonAnchorInstruction;
+
+export type ParsedInfo = Infer<typeof ParsedInfo>;
+export const ParsedInfo = type({
+  type: string(),
+  info: any(),
+});
+
+export const PARSERS: Record<string, IXParser> = {
+  [MEMO_PROGRAM_ID.toString()]: (
+    ix
+  ): ParsedNonAnchorInstruction<MemoInstruction> => {
+    const text = ix.data.toString("utf-8");
+    return { text, name: "Memo", program: "memo" };
+  },
+  [TOKEN_PROGRAM_ID.toString()]: (
+    ix
+  ): ParsedNonAnchorInstruction<TokenInstruction> => {
+    const result = parseTokenInstruction(ix);
+    const name = IX_TITLES[result.type];
+    return { ...result, name, program: "token" };
+  },
+  [BPF_UPGRADEABLE_LOADER_ID.toString()]: (
+    ix
+  ): ParsedNonAnchorInstruction<UpgradeableLoaderInstruction> => {
+    const result = parseUpgradeableLoaderInstruction(ix);
+    return { ...result, program: "upgradeable_loader" };
+  },
+  [SystemProgram.programId.toString()]: (
+    ix
+  ): ParsedNonAnchorInstruction<SystemProgramInstruction> => {
+    const ixType = SystemInstruction.decodeInstructionType(ix);
+    const decoded = (() => {
+      switch (ixType) {
+        case "Transfer":
+          return SystemInstruction.decodeTransfer(ix);
+        case "TransferWithSeed":
+          return SystemInstruction.decodeTransferWithSeed(ix);
+        case "Create":
+          return SystemInstruction.decodeCreateAccount(ix);
+        case "WithdrawNonceAccount":
+          return SystemInstruction.decodeNonceWithdraw(ix);
+        default:
+          return null;
+      }
+    })();
+    return {
+      type: ixType,
+      decoded,
+      name: startCase(ixType),
+      program: "system",
+    };
+  },
+};
+
+export class InstructionParseError extends Error {
+  constructor(
+    readonly ix: TransactionInstruction,
+    readonly originalError: unknown
+  ) {
+    super(extractErrorMessage(originalError) ?? "unknown");
+    this.name = "InstructionParseError";
+    if (originalError instanceof Error) {
+      this.stack = originalError.stack;
+    }
+  }
+}
+
+export const parseNonAnchorInstruction = (
+  ix: TransactionInstruction
+):
+  | ParsedNonAnchorInstruction
+  | {
+      error: InstructionParseError;
+    }
+  | null => {
+  const parser = PARSERS[ix.programId.toString()];
+  if (!parser) {
+    return null;
+  }
+  try {
+    return parser(ix);
+  } catch (e) {
+    return { error: new InstructionParseError(ix, e) };
+  }
+};
diff --git a/helpers/instructions/token/parsers.ts b/helpers/instructions/token/parsers.ts
new file mode 100644
index 00000000..6b1eeab4
--- /dev/null
+++ b/helpers/instructions/token/parsers.ts
@@ -0,0 +1,115 @@
+import { structLayout, u64, Uint64Layout } from "@saberhq/token-utils";
+import * as BufferLayout from "@solana/buffer-layout";
+import type { PublicKey, TransactionInstruction } from "@solana/web3.js";
+
+import type { TokenInstructionType, Transfer, TransferChecked } from "./types";
+import { tokenInstructionTypes } from "./types";
+
+export type TokenInstructionData = Transfer | TransferChecked;
+
+type TokenDatas = {
+  transfer: Transfer;
+  transfer2: TransferChecked;
+};
+
+export type TokenInstructionInner =
+  | {
+      [K in keyof TokenDatas]: {
+        type: K;
+        data: TokenDatas[K] | null;
+      };
+    }[keyof TokenDatas]
+  | {
+      type: {
+        [K in TokenInstructionType]: K extends keyof TokenDatas ? never : K;
+      }[TokenInstructionType];
+      data: null;
+    };
+
+export type TokenIxData<K extends TokenInstructionType> =
+  K extends keyof TokenDatas ? TokenDatas[K] : null;
+
+export const parseTokenInstructionData = <
+  K extends TokenInstructionInner["type"]
+>(
+  type: K,
+  keys: PublicKey[],
+  data: Buffer
+): (TokenInstructionInner & { type: K })["data"] => {
+  switch (type) {
+    case "transfer": {
+      const dataLayout = BufferLayout.struct<{
+        amount: Uint8Array;
+      }>([Uint64Layout("amount")]);
+      const decoded = dataLayout.decode(data);
+      const [source, destination, authority] = keys;
+      if (!source || !destination || !authority) {
+        return null;
+      }
+      const amount = u64.fromBuffer(Buffer.from(decoded.amount));
+      return {
+        source,
+        destination,
+        amount: amount.toString(),
+        authority,
+      };
+    }
+    case "transfer2": {
+      const dataLayout = structLayout<{
+        amount: Uint8Array;
+        decimals: number;
+      }>([Uint64Layout("amount"), BufferLayout.u8("decimals")]);
+      const decoded = dataLayout.decode(data);
+      const [source, mint, destination, authority] = keys;
+      if (!source || !destination || !mint) {
+        return null;
+      }
+      const amount = u64.fromBuffer(Buffer.from(decoded.amount));
+      return {
+        source,
+        destination,
+        mint,
+        tokenAmount: {
+          amount: amount.toString(),
+          decimals: decoded.decimals,
+          uiAmountString: amount.toString(),
+        },
+        authority,
+      };
+    }
+  }
+  return null;
+};
+
+const accountLabels: { [K in TokenInstructionType]?: string[] } = {
+  transfer: ["Source", "Destination", "Authority"],
+  transfer2: ["Source", "Mint", "Destination", "Authority"],
+};
+
+export const parseTokenInstruction = (
+  ix: TransactionInstruction
+): TokenInstructionInner & {
+  accountLabels?: string[];
+} => {
+  const ixLayout = structLayout<{
+    instruction: number;
+  }>([BufferLayout.u8("instruction")]);
+  const { instruction } = ixLayout.decode(ix.data);
+  const rest = ix.data.slice(1);
+  const ixType = tokenInstructionTypes[instruction];
+  if (!ixType) {
+    throw new Error("ix type");
+  }
+  const data = parseTokenInstructionData(
+    ixType,
+    ix.keys.map((k) => k.pubkey),
+    rest
+  );
+  return {
+    type: ixType,
+    data,
+    accountLabels: accountLabels[ixType],
+  } as TokenInstructionInner & {
+    accountLabels?: string[];
+  };
+};
diff --git a/helpers/instructions/token/types.ts b/helpers/instructions/token/types.ts
new file mode 100644
index 00000000..1045a478
--- /dev/null
+++ b/helpers/instructions/token/types.ts
@@ -0,0 +1,237 @@
+import type { Infer } from "superstruct";
+import {
+  array,
+  enums,
+  nullable,
+  number,
+  optional,
+  string,
+  type,
+  union,
+} from "superstruct";
+
+import { PublicKeyFromString } from "../../validators/pubkey";
+
+export type TokenAmountUi = Infer<typeof TokenAmountUi>;
+export const TokenAmountUi = type({
+  amount: string(),
+  decimals: number(),
+  uiAmountString: string(),
+});
+
+const InitializeMint = type({
+  mint: PublicKeyFromString,
+  decimals: number(),
+  mintAuthority: PublicKeyFromString,
+  rentSysvar: PublicKeyFromString,
+  freezeAuthority: optional(PublicKeyFromString),
+});
+
+const InitializeAccount = type({
+  account: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  owner: PublicKeyFromString,
+  rentSysvar: PublicKeyFromString,
+});
+
+const InitializeMultisig = type({
+  multisig: PublicKeyFromString,
+  rentSysvar: PublicKeyFromString,
+  signers: array(PublicKeyFromString),
+  m: number(),
+});
+
+export type Transfer = Infer<typeof Transfer>;
+export const Transfer = type({
+  source: PublicKeyFromString,
+  destination: PublicKeyFromString,
+  amount: union([string(), number()]),
+  authority: optional(PublicKeyFromString),
+  multisigAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const Approve = type({
+  source: PublicKeyFromString,
+  delegate: PublicKeyFromString,
+  amount: union([string(), number()]),
+  owner: optional(PublicKeyFromString),
+  multisigOwner: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const Revoke = type({
+  source: PublicKeyFromString,
+  owner: optional(PublicKeyFromString),
+  multisigOwner: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const AuthorityType = enums([
+  "mintTokens",
+  "freezeAccount",
+  "accountOwner",
+  "closeAccount",
+]);
+
+const SetAuthority = type({
+  mint: optional(PublicKeyFromString),
+  account: optional(PublicKeyFromString),
+  authorityType: AuthorityType,
+  newAuthority: nullable(PublicKeyFromString),
+  authority: optional(PublicKeyFromString),
+  multisigAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const MintTo = type({
+  mint: PublicKeyFromString,
+  account: PublicKeyFromString,
+  amount: union([string(), number()]),
+  mintAuthority: optional(PublicKeyFromString),
+  multisigMintAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const Burn = type({
+  account: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  amount: union([string(), number()]),
+  authority: optional(PublicKeyFromString),
+  multisigAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const CloseAccount = type({
+  account: PublicKeyFromString,
+  destination: PublicKeyFromString,
+  owner: optional(PublicKeyFromString),
+  multisigOwner: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const FreezeAccount = type({
+  account: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  freezeAuthority: optional(PublicKeyFromString),
+  multisigFreezeAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+const ThawAccount = type({
+  account: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  freezeAuthority: optional(PublicKeyFromString),
+  multisigFreezeAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+});
+
+export type TransferChecked = Infer<typeof TransferChecked>;
+export const TransferChecked = type({
+  source: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  destination: PublicKeyFromString,
+  authority: optional(PublicKeyFromString),
+  multisigAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+  tokenAmount: TokenAmountUi,
+});
+
+const ApproveChecked = type({
+  source: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  delegate: PublicKeyFromString,
+  owner: optional(PublicKeyFromString),
+  multisigOwner: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+  tokenAmount: TokenAmountUi,
+});
+
+const MintToChecked = type({
+  account: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  mintAuthority: optional(PublicKeyFromString),
+  multisigMintAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+  tokenAmount: TokenAmountUi,
+});
+
+const BurnChecked = type({
+  account: PublicKeyFromString,
+  mint: PublicKeyFromString,
+  authority: optional(PublicKeyFromString),
+  multisigAuthority: optional(PublicKeyFromString),
+  signers: optional(array(PublicKeyFromString)),
+  tokenAmount: TokenAmountUi,
+});
+
+export const tokenInstructionTypes = [
+  "initializeMint",
+  "initializeAccount",
+  "initializeMultisig",
+  "transfer",
+  "approve",
+  "revoke",
+  "setAuthority",
+  "mintTo",
+  "burn",
+  "closeAccount",
+  "freezeAccount",
+  "thawAccount",
+  "transfer2",
+  "approve2",
+  "mintTo2",
+  "burn2",
+  "transferChecked",
+  "approveChecked",
+  "mintToChecked",
+  "burnChecked",
+] as const;
+export type TokenInstructionType = Infer<typeof TokenInstructionType>;
+export const TokenInstructionType = enums(tokenInstructionTypes);
+
+export const IX_STRUCTS = {
+  initializeMint: InitializeMint,
+  initializeAccount: InitializeAccount,
+  initializeMultisig: InitializeMultisig,
+  transfer: Transfer,
+  approve: Approve,
+  revoke: Revoke,
+  setAuthority: SetAuthority,
+  mintTo: MintTo,
+  burn: Burn,
+  closeAccount: CloseAccount,
+  freezeAccount: FreezeAccount,
+  thawAccount: ThawAccount,
+  transfer2: TransferChecked,
+  approve2: ApproveChecked,
+  mintTo2: MintToChecked,
+  burn2: BurnChecked,
+  transferChecked: TransferChecked,
+  approveChecked: ApproveChecked,
+  mintToChecked: MintToChecked,
+  burnChecked: BurnChecked,
+};
+
+export const IX_TITLES = {
+  initializeMint: "Initialize Mint",
+  initializeAccount: "Initialize Account",
+  initializeMultisig: "Initialize Multisig",
+  transfer: "Transfer",
+  approve: "Approve",
+  revoke: "Revoke",
+  setAuthority: "Set Authority",
+  mintTo: "Mint To",
+  burn: "Burn",
+  closeAccount: "Close Account",
+  freezeAccount: "Freeze Account",
+  thawAccount: "Thaw Account",
+  transfer2: "Transfer (Checked)",
+  approve2: "Approve (Checked)",
+  mintTo2: "Mint To (Checked)",
+  burn2: "Burn (Checked)",
+  transferChecked: "Transfer (Checked)",
+  approveChecked: "Approve (Checked)",
+  mintToChecked: "Mint To (Checked)",
+  burnChecked: "Burn (Checked)",
+};
diff --git a/helpers/instructions/upgradeable_loader/instructions.ts b/helpers/instructions/upgradeable_loader/instructions.ts
new file mode 100644
index 00000000..3faf68a9
--- /dev/null
+++ b/helpers/instructions/upgradeable_loader/instructions.ts
@@ -0,0 +1,223 @@
+// https://github.com/solana-labs/solana/blob/master/sdk/program/src/loader_upgradeable_instruction.rs
+
+import type { AccountMeta } from "@solana/web3.js";
+import {
+  PublicKey,
+  SYSVAR_CLOCK_PUBKEY,
+  SYSVAR_RENT_PUBKEY,
+  TransactionInstruction,
+} from "@solana/web3.js";
+
+import { makeUpgradeableLoaderInstructionData } from "./parsers";
+
+export const BPF_UPGRADEABLE_LOADER_ID = new PublicKey(
+  "BPFLoaderUpgradeab1e11111111111111111111111"
+);
+
+interface Upgrade {
+  program: PublicKey;
+  buffer: PublicKey;
+  spill: PublicKey;
+  signer: PublicKey;
+}
+
+/**
+ * Upgrade a program.
+ *
+ * A program can be updated as long as the program's authority has not been
+ * set to `None`.
+ *
+ * The Buffer account must contain sufficient lamports to fund the
+ * ProgramData account to be rent-exempt, any additional lamports left over
+ * will be transferred to the spill account, leaving the Buffer account
+ * balance at zero.
+ *
+ * # Account references
+ *   0. `[writable]` The ProgramData account.
+ *   1. `[writable]` The Program account.
+ *   2. `[writable]` The Buffer account where the program data has been
+ *      written.  The buffer account's authority must match the program's
+ *      authority
+ *   3. `[writable]` The spill account.
+ *   4. `[]` Rent sysvar.
+ *   5. `[]` Clock sysvar.
+ *   6. `[signer]` The program's authority.
+ */
+export const createUpgradeInstruction = async ({
+  program,
+  buffer,
+  spill,
+  signer,
+}: Upgrade): Promise<TransactionInstruction> => {
+  const [programData] = await PublicKey.findProgramAddress(
+    [program.toBuffer()],
+    BPF_UPGRADEABLE_LOADER_ID
+  );
+  return new TransactionInstruction({
+    programId: BPF_UPGRADEABLE_LOADER_ID,
+    data: makeUpgradeableLoaderInstructionData("upgrade"),
+    keys: [
+      {
+        pubkey: programData,
+        isSigner: false,
+        isWritable: true,
+      },
+      {
+        pubkey: program,
+        isSigner: false,
+        isWritable: true,
+      },
+      {
+        pubkey: buffer,
+        isSigner: false,
+        isWritable: true,
+      },
+      {
+        pubkey: spill,
+        isSigner: false,
+        isWritable: true,
+      },
+      {
+        pubkey: SYSVAR_RENT_PUBKEY,
+        isSigner: false,
+        isWritable: false,
+      },
+      {
+        pubkey: SYSVAR_CLOCK_PUBKEY,
+        isSigner: false,
+        isWritable: false,
+      },
+      {
+        pubkey: signer,
+        isSigner: true,
+        isWritable: false,
+      },
+    ],
+  });
+};
+
+interface SetAuthority {
+  account: PublicKey;
+  authority: PublicKey;
+  nextAuthority: PublicKey;
+}
+
+export const findProgramDataAddress = (programID: PublicKey) =>
+  PublicKey.findProgramAddress(
+    [programID.toBuffer()],
+    BPF_UPGRADEABLE_LOADER_ID
+  );
+
+/**
+ * Set a new authority that is allowed to write the buffer or upgrade the
+ * program.  To permanently make the buffer immutable or disable program
+ * updates omit the new authority.
+ *
+ * # Account references
+ *   0. `[writable]` The Buffer or ProgramData account to change the
+ *      authority of.
+ *   1. `[signer]` The current authority.
+ *   2. `[]` The new authority, optional, if omitted then the program will
+ *      not be upgradeable.
+ */
+export const createSetAuthorityInstruction = ({
+  account,
+  authority,
+  nextAuthority,
+}: SetAuthority): TransactionInstruction => {
+  return new TransactionInstruction({
+    programId: BPF_UPGRADEABLE_LOADER_ID,
+    data: makeUpgradeableLoaderInstructionData("setAuthority"),
+    keys: [
+      {
+        pubkey: account,
+        isSigner: false,
+        isWritable: true,
+      },
+      {
+        pubkey: authority,
+        isSigner: true,
+        isWritable: false,
+      },
+      {
+        pubkey: nextAuthority,
+        isSigner: false,
+        isWritable: false,
+      },
+    ],
+  });
+};
+
+interface Close {
+  /**
+   * The account to close, if closing a program must be the
+   * ProgramData account.
+   */
+  account: PublicKey;
+  /**
+   * The account to deposit the closed account's lamports.
+   */
+  spill: PublicKey;
+  /**
+   * The account's authority, Optional, required for
+   * initialized accounts.
+   */
+  authority?: PublicKey;
+  /**
+   * The associated Program account if the account to close
+   * is a ProgramData account.
+   */
+  program?: PublicKey;
+}
+
+/**
+ * Closes an account owned by the upgradeable loader of all lamports and
+ * withdraws all the lamports
+ *
+ * # Account references
+ *   0. `[writable]` The account to close, if closing a program must be the
+ *      ProgramData account.
+ *   1. `[writable]` The account to deposit the closed account's lamports.
+ *   2. `[signer]` The account's authority, Optional, required for
+ *      initialized accounts.
+ *   3. `[writable]` The associated Program account if the account to close
+ *      is a ProgramData account.
+ */
+export const createCloseInstruction = ({
+  account,
+  spill,
+  authority,
+  program,
+}: Close): TransactionInstruction => {
+  const keys: AccountMeta[] = [
+    {
+      pubkey: account,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: spill,
+      isSigner: false,
+      isWritable: true,
+    },
+  ];
+  if (authority) {
+    keys.push({
+      pubkey: authority,
+      isSigner: true,
+      isWritable: false,
+    });
+    if (program) {
+      keys.push({
+        pubkey: program,
+        isSigner: false,
+        isWritable: true,
+      });
+    }
+  }
+  return new TransactionInstruction({
+    programId: BPF_UPGRADEABLE_LOADER_ID,
+    data: makeUpgradeableLoaderInstructionData("close"),
+    keys,
+  });
+};
diff --git a/helpers/instructions/upgradeable_loader/parsers.ts b/helpers/instructions/upgradeable_loader/parsers.ts
new file mode 100644
index 00000000..3f720ed1
--- /dev/null
+++ b/helpers/instructions/upgradeable_loader/parsers.ts
@@ -0,0 +1,72 @@
+import * as BufferLayout from "@solana/buffer-layout";
+import type { TransactionInstruction } from "@solana/web3.js";
+import { startCase } from "lodash";
+
+const instructions = [
+  "initializeBuffer",
+  "write",
+  "deployWithMaxDataLen",
+  "upgrade",
+  "setAuthority",
+  "close",
+] as const;
+
+export type UpgradeableLoaderInstructionType = typeof instructions[number];
+
+export const makeUpgradeableLoaderInstructionData = (
+  type: UpgradeableLoaderInstructionType
+): Buffer => {
+  return Buffer.from([instructions.indexOf(type), 0, 0, 0]);
+};
+
+export type UpgradeableLoaderInstructionData = {
+  name: string;
+  type: UpgradeableLoaderInstructionType;
+  accountLabels?: string[];
+};
+
+/**
+ * See: <https://github.com/solana-labs/solana/blob/master/sdk/program/src/loader_upgradeable_instruction.rs>
+ */
+const accountLabels: { [K in UpgradeableLoaderInstructionType]?: string[] } = {
+  initializeBuffer: ["Buffer", "Buffer Authority"],
+  write: ["Buffer", "Buffer Authority"],
+  deployWithMaxDataLen: [
+    "Payer",
+    "Program Data",
+    "Program",
+    "Buffer",
+    "Rent",
+    "Clock",
+    "Program Authority",
+  ],
+  upgrade: [
+    "Program Data",
+    "Program",
+    "Buffer",
+    "Spill",
+    "Rent",
+    "Clock",
+    "Program Authority",
+  ],
+  setAuthority: ["Account", "Authority", "Next Authority"],
+  close: ["Account", "Spill", "Authority", "Program"],
+};
+
+export const parseUpgradeableLoaderInstruction = (
+  ix: TransactionInstruction
+): UpgradeableLoaderInstructionData => {
+  const ixLayout = BufferLayout.struct<{
+    instruction: number;
+  }>([BufferLayout.u32("instruction")]);
+  const { instruction } = ixLayout.decode(ix.data);
+  const ixType = instructions[instruction];
+  if (!ixType) {
+    throw new Error("ix type");
+  }
+  return {
+    type: ixType,
+    name: startCase(ixType as string),
+    accountLabels: accountLabels[ixType],
+  };
+};
diff --git a/helpers/instructions/upgradeable_loader/types.ts b/helpers/instructions/upgradeable_loader/types.ts
new file mode 100644
index 00000000..8a40eae7
--- /dev/null
+++ b/helpers/instructions/upgradeable_loader/types.ts
@@ -0,0 +1,188 @@
+import { u64 } from '@saberhq/token-utils';
+import { PublicKey } from '@solana/web3.js';
+import type { Infer } from 'superstruct';
+import {
+  any,
+  coerce,
+  create,
+  literal,
+  nullable,
+  number,
+  type,
+  union
+} from 'superstruct';
+
+import { PublicKeyFromString } from '../../validators/pubkey';
+import { ParsedInfo } from '../parseNonAnchorInstruction';
+
+export type ProgramAccountInfo = Infer<typeof ProgramAccountInfo>;
+export const ProgramAccountInfo = type({
+  programData: PublicKeyFromString
+});
+
+export type ProgramAccount = Infer<typeof ProgramDataAccount>;
+export const ProgramAccount = type({
+  type: literal('program'),
+  info: ProgramAccountInfo
+});
+
+export type ProgramDataAccountInfo = Infer<typeof ProgramDataAccountInfo>;
+export const ProgramDataAccountInfo = type({
+  authority: nullable(PublicKeyFromString),
+  // don't care about data yet
+  slot: number()
+});
+
+export type ProgramDataAccount = Infer<typeof ProgramDataAccount>;
+export const ProgramDataAccount = type({
+  type: literal('programData'),
+  info: ProgramDataAccountInfo
+});
+
+export type ProgramBufferAccountInfo = Infer<typeof ProgramBufferAccountInfo>;
+export const ProgramBufferAccountInfo = type({
+  authority: nullable(PublicKeyFromString)
+  // don't care about data yet
+});
+
+export type ProgramBufferAccount = Infer<typeof ProgramBufferAccount>;
+export const ProgramBufferAccount = type({
+  type: literal('buffer'),
+  info: ProgramBufferAccountInfo
+});
+
+export type ProgramUninitializedAccountInfo = Infer<
+  typeof ProgramUninitializedAccountInfo
+>;
+export const ProgramUninitializedAccountInfo = any();
+
+export type ProgramUninitializedAccount = Infer<
+  typeof ProgramUninitializedAccount
+>;
+export const ProgramUninitializedAccount = type({
+  type: literal('uninitialized'),
+  info: ProgramUninitializedAccountInfo
+});
+
+const ACCOUNT_TYPE_SIZE = 4;
+const SLOT_SIZE = 8; // size_of::<u64>();
+const OPTION_SIZE = 1;
+const PUBKEY_LEN = 32;
+
+export type BPFUpgradeableLoaderAccount =
+  | {
+      type: 'uninitialized';
+    }
+  | {
+      type: 'buffer';
+      authority: PublicKey;
+      data: Uint8Array;
+    }
+  | {
+      type: 'program';
+      programData: PublicKey;
+    }
+  | {
+      type: 'programData';
+      slot: u64;
+      upgradeAuthority: PublicKey;
+      data: Uint8Array;
+    }
+  | {
+      type: 'error';
+    };
+
+/**
+ * raw: https://github.com/solana-labs/solana/blob/master/sdk/program/src/bpf_loader_upgradeable.rs
+ */
+export const decodeBPFUpgradeableLoaderAccount = (
+  data: Uint8Array
+): BPFUpgradeableLoaderAccount => {
+  const type = data.slice(0, ACCOUNT_TYPE_SIZE);
+  const rest = data.slice(ACCOUNT_TYPE_SIZE);
+  switch (type[0]) {
+    case 0: {
+      return {
+        type: 'uninitialized'
+      };
+    }
+    case 1: {
+      return {
+        type: 'buffer',
+        authority: new PublicKey(
+          Buffer.from(rest.slice(OPTION_SIZE, OPTION_SIZE + PUBKEY_LEN))
+        ),
+        data: rest.slice(OPTION_SIZE + PUBKEY_LEN)
+      };
+    }
+    case 2: {
+      return {
+        type: 'program',
+        programData: new PublicKey(rest.slice(0, PUBKEY_LEN))
+      };
+    }
+    case 3: {
+      return {
+        type: 'programData',
+        slot: u64.fromBuffer(Buffer.from(rest.slice(0, SLOT_SIZE))),
+        upgradeAuthority: new PublicKey(
+          rest.slice(
+            SLOT_SIZE + OPTION_SIZE,
+            SLOT_SIZE + OPTION_SIZE + PUBKEY_LEN
+          )
+        ),
+        data: rest.slice(SLOT_SIZE + PUBKEY_LEN)
+      };
+    }
+    default: {
+      return {
+        type: 'error'
+      };
+    }
+  }
+};
+
+export type UpgradeableLoaderAccount = Infer<typeof UpgradeableLoaderAccount>;
+export const UpgradeableLoaderAccount = coerce(
+  union([
+    ProgramAccount,
+    ProgramDataAccount,
+    ProgramBufferAccount,
+    ProgramUninitializedAccount
+  ]),
+  ParsedInfo,
+  value => {
+    // Coercions like `PublicKeyFromString` are not applied within
+    // union validators so we use this custom coercion as a workaround.
+    switch (value.type) {
+      case 'program': {
+        return {
+          type: value.type,
+          info: create(value.info, ProgramAccountInfo)
+        };
+      }
+      case 'programData': {
+        return {
+          type: value.type,
+          info: create(value.info, ProgramDataAccountInfo)
+        };
+      }
+      case 'buffer': {
+        return {
+          type: value.type,
+          info: create(value.info, ProgramBufferAccountInfo)
+        };
+      }
+      case 'uninitialized': {
+        return {
+          type: value.type,
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+          info: create(value.info, ProgramUninitializedAccountInfo)
+        };
+      }
+      default: {
+        throw new Error(`Unknown program account type: ${value.type}`);
+      }
+    }
+  }
+);
diff --git a/helpers/parser.ts b/helpers/parser.ts
new file mode 100644
index 00000000..8271062d
--- /dev/null
+++ b/helpers/parser.ts
@@ -0,0 +1,66 @@
+import { GOKI_CODERS } from '@gokiprotocol/client';
+import { makeParserHooks, makeProgramParserHooks } from '@saberhq/sail';
+import { SNAPSHOTS_CODERS } from '@saberhq/snapshots';
+
+import { HONEY_DAO_CODERS } from './sdk';
+
+const parserHooks = makeParserHooks({
+  ...HONEY_DAO_CODERS.Govern.accountParsers,
+  ...HONEY_DAO_CODERS.LockedVoter.accountParsers,
+  ...GOKI_CODERS.SmartWallet.accountParsers
+});
+
+export const {
+  proposal: { useData: useParsedProposals, useSingleData: useParsedProposal },
+  proposalMeta: {
+    useData: useParsedProposalMetas,
+    useSingleData: useParsedProposalMeta
+  },
+  locker: { useData: useParsedLockers, useSingleData: useParsedLocker },
+  escrow: { useData: useParsedEscrows, useSingleData: useParsedEscrow },
+  governor: { useData: useParsedGovernors, useSingleData: useParsedGovernor },
+  vote: { useData: useParsedVotes, useSingleData: useParsedVote },
+  transaction: { useData: useParsedTXByKeys, useSingleData: useParsedTXByKey }
+} = parserHooks;
+
+export const {
+  proposal: { useData: useProposalsData, useSingleData: useProposalData },
+  proposalMeta: {
+    useData: useProposalMetasData,
+    useSingleData: useProposalMetaData
+  },
+  governor: { useData: useGovernorsData, useSingleData: useGovernorData },
+  vote: { useData: useVotesData, useSingleData: useVoteData }
+} = makeProgramParserHooks(HONEY_DAO_CODERS.Govern);
+
+export const {
+  subaccountInfo: {
+    useData: useSubaccountInfosData,
+    useBatchedData: useBatchedSubaccountInfos,
+    useSingleData: useSubaccountInfoData
+  },
+  transaction: {
+    useData: useGokiTransactionsData,
+    useBatchedData: useBatchedGokiTransactions,
+    useSingleData: useGokiTransactionData
+  },
+  smartWallet: { useSingleData: useGokiSmartWalletData }
+} = makeProgramParserHooks(GOKI_CODERS.SmartWallet);
+
+export const {
+  escrow: { useSingleData: useEscrowData },
+  locker: { useSingleData: useLockerData }
+} = makeProgramParserHooks(HONEY_DAO_CODERS.LockedVoter);
+
+export const {
+  lockerHistory: {
+    useSingleData: useLockerHistoriesData,
+    useData: useLockerHistoryData,
+    useBatchedData: useBatchedLockerHistories
+  },
+  escrowHistory: {
+    useSingleData: useEscrowHistoriesData,
+    useData: useEscrowHistoryData,
+    useBatchedData: useBatchedEscrowHistories
+  }
+} = makeProgramParserHooks(SNAPSHOTS_CODERS.Snapshots);
diff --git a/helpers/programs/veHoney.ts b/helpers/programs/veHoney.ts
new file mode 100644
index 00000000..773c49b5
--- /dev/null
+++ b/helpers/programs/veHoney.ts
@@ -0,0 +1,22 @@
+import type { AnchorTypes } from '@saberhq/anchor-contrib';
+
+import type { VeHoney as VoterIDL } from '../types/ve_honey';
+
+export type LockedVoterTypes = AnchorTypes<
+  VoterIDL,
+  {
+    locker: LockerData;
+    escrow: EscrowData;
+    lockerWhitelistEntry: LockerWhitelistEntryData;
+  }
+>;
+
+type Accounts = LockedVoterTypes['Accounts'];
+export type LockerData = Accounts['lockerV2'];
+export type EscrowData = Accounts['escrowV2'];
+export type LockerWhitelistEntryData = Accounts['whitelistEntry'];
+
+export type LockerParams = LockedVoterTypes['Defined']['LockerParamsV2'];
+
+export type LockedVoterError = LockedVoterTypes['Error'];
+export type LockedVoterProgram = LockedVoterTypes['Program'];
diff --git a/helpers/sdk/constant.ts b/helpers/sdk/constant.ts
index 1bd95fda..697ecea7 100644
--- a/helpers/sdk/constant.ts
+++ b/helpers/sdk/constant.ts
@@ -1,4 +1,9 @@
 import { PublicKey } from '@solana/web3.js';
+import { buildCoderMap } from '@saberhq/anchor-contrib';
+import type { GovernTypes } from '@tribecahq/tribeca-sdk';
+import { GovernJSON } from '@tribecahq/tribeca-sdk';
+import type { LockedVoterTypes } from 'helpers/programs/veHoney';
+import { IDL } from 'helpers/types/ve_honey';
 
 export const HONEY_WADS = 1000000;
 
@@ -17,3 +22,29 @@ export const WHITELIST_ENTRY = new PublicKey(
 );
 
 export const PHONEY_DECIMALS = 6;
+
+// See `Anchor.toml` for all addresses.
+export const HONEY_DAO_ADDRESSES = {
+  Govern: new PublicKey('Govz1VyoyLD5BL6CSCxUJLVLsQHRwjfFj1prNsdNg5Jw'),
+  LockedVoter: new PublicKey('5i6s4zbxYGDhY1UGNZwrtBUAp7u2fnJ8ZSXu39eZWjNT')
+};
+
+/**
+ * Program IDLs.
+ */
+export const HONEY_DAO_IDLS = {
+  Govern: GovernJSON,
+  LockedVoter: IDL
+};
+
+export const HONEY_DAO_CODERS = buildCoderMap<{
+  Govern: GovernTypes;
+  LockedVoter: LockedVoterTypes;
+}>(HONEY_DAO_IDLS, HONEY_DAO_ADDRESSES);
+
+export const PROPOSAL_TITLE_MAX_LEN = 140;
+
+export const GOVERNOR_ADDRESS = new PublicKey(
+  process.env.NEXT_PUBLIC_GOVERNOR_ADDRESS ||
+    'H8Vs8jXXXRW2JTcxhXb2bnngxvmHWdbmExVNjrj5YXvr'
+);
diff --git a/helpers/sdk/gov.ts b/helpers/sdk/gov.ts
new file mode 100644
index 00000000..72643567
--- /dev/null
+++ b/helpers/sdk/gov.ts
@@ -0,0 +1,84 @@
+import type { GOKI_ADDRESSES } from '@gokiprotocol/client';
+import { GokiSDK } from '@gokiprotocol/client';
+import { useNativeAccount } from '@saberhq/sail';
+import { SignerWallet, SolanaProvider } from '@saberhq/solana-contrib';
+import type { TokenAmount } from '@saberhq/token-utils';
+import { useConnectedWallet, useConnectionContext } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import { Keypair } from '@solana/web3.js';
+import { TribecaSDK } from '@tribecahq/tribeca-sdk';
+import { useMemo } from 'react';
+import { createContainer } from 'unstated-next';
+
+export type ProgramKey = keyof typeof GOKI_ADDRESSES;
+
+export const useSDKInternal = (): {
+  sdk: GokiSDK;
+  sdkMut: GokiSDK | null;
+  owner: PublicKey | null;
+  nativeBalance?: TokenAmount | null;
+  tribecaMut: TribecaSDK | null;
+} => {
+  const { connection } = useConnectionContext();
+  const wallet = useConnectedWallet();
+
+  const { sdk: sdk } = useMemo(() => {
+    const provider = SolanaProvider.init({
+      connection,
+      wallet: new SignerWallet(Keypair.generate()),
+      opts: {
+        commitment: 'recent'
+      }
+    });
+    return {
+      sdk: GokiSDK.load({ provider })
+    };
+  }, [connection]);
+
+  const { sdkMut } = useMemo(() => {
+    if (!wallet) {
+      return { sdkMut: null };
+    }
+    const provider = SolanaProvider.init({
+      connection,
+      wallet,
+      opts: {
+        commitment: 'recent'
+      }
+    });
+    return {
+      sdkMut: GokiSDK.load({ provider })
+    };
+  }, [connection, wallet]);
+
+  const tribecaMut = useMemo(() => {
+    if (!wallet) {
+      return null;
+    }
+    const provider = SolanaProvider.init({
+      connection,
+      wallet,
+      opts: {
+        commitment: 'recent'
+      }
+    });
+    return TribecaSDK.load({ provider });
+  }, [connection, wallet]);
+
+  const owner = useMemo(
+    () => sdkMut?.provider.wallet.publicKey ?? null,
+    [sdkMut?.provider.wallet.publicKey]
+  );
+  const { nativeBalance } = useNativeAccount();
+
+  return {
+    owner,
+    nativeBalance,
+    sdk,
+    sdkMut: sdkMut ?? null,
+    tribecaMut
+  };
+};
+
+export const { useContainer: useSDK, Provider: SDKProvider } =
+  createContainer(useSDKInternal);
diff --git a/helpers/sdk/index.ts b/helpers/sdk/index.ts
index 3ca89334..bc1993f0 100644
--- a/helpers/sdk/index.ts
+++ b/helpers/sdk/index.ts
@@ -1,3 +1,4 @@
 export * from './constant';
 export * from './stake';
 export * from './vehoney';
+export * from './gov';
diff --git a/helpers/sdk/vehoney.ts b/helpers/sdk/vehoney.ts
index 76a2aacc..454326e5 100644
--- a/helpers/sdk/vehoney.ts
+++ b/helpers/sdk/vehoney.ts
@@ -55,15 +55,16 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
         escrow,
         this.wallet.publicKey
       ),
-      this.program.instruction.initEscrow({
-        accounts: {
+      await this.program.methods
+        .initEscrow()
+        .accounts({
           payer: this.wallet.publicKey,
           locker,
           escrow,
           escrowOwner: this.wallet.publicKey,
           systemProgram: anchor.web3.SystemProgram.programId
-        }
-      })
+        })
+        .instruction()
     ];
   }
 
@@ -76,8 +77,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
       [escrow] = await this.getEscrowPDA(locker);
     }
 
-    let preInstructions: anchor.web3.TransactionInstruction[] | undefined =
-      undefined;
+    let preInstructions: anchor.web3.TransactionInstruction[] = [];
     if (!destination) {
       destination = await Token.getAssociatedTokenAddress(
         ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -86,7 +86,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
         this.wallet.publicKey
       );
 
-      preInstructions = [
+      preInstructions.push(
         Token.createAssociatedTokenAccountInstruction(
           ASSOCIATED_TOKEN_PROGRAM_ID,
           TOKEN_PROGRAM_ID,
@@ -95,13 +95,14 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
           this.wallet.publicKey,
           this.wallet.publicKey
         )
-      ];
+      );
     }
 
     const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
 
-    const txSig = await this.program.rpc.exit({
-      accounts: {
+    const txSig = await this.program.methods
+      .exit()
+      .accounts({
         payer: this.wallet.publicKey,
         locker,
         escrow,
@@ -109,9 +110,9 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
         lockedTokens,
         destinationTokens: destination,
         tokenProgram: TOKEN_PROGRAM_ID
-      },
-      preInstructions
-    });
+      })
+      .preInstructions(preInstructions)
+      .rpc();
 
     return { txSig, destination };
   }
@@ -123,9 +124,10 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
     duration: anchor.BN,
     hasEscrow?: boolean
   ) {
-    const preInstructions = !hasEscrow
-      ? [...(await this.createInitializeEscrowIx(locker))]
-      : undefined;
+    const preInstructions = [];
+    if (!hasEscrow) {
+      preInstructions.push(...(await this.createInitializeEscrowIx(locker)));
+    }
 
     const remainingAccounts = [
       {
@@ -143,26 +145,159 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
     const [escrow] = await this.getEscrowPDA(locker);
     const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
 
-    const txSig = await this.program.rpc.lock(
-      new anchor.BN(amount),
-      new anchor.BN(duration),
-      {
-        accounts: {
+    const txSig = await this.program.methods
+      .lock(new anchor.BN(amount), new anchor.BN(duration))
+      .accounts({
+        locker,
+        escrow,
+        lockedTokens,
+        escrowOwner: this.wallet.publicKey,
+        sourceTokens: source,
+        sourceTokensAuthority: this.wallet.publicKey,
+        tokenProgram: TOKEN_PROGRAM_ID
+      })
+      .remainingAccounts(remainingAccounts)
+      .preInstructions(preInstructions)
+      .rpc();
+    return { txSig, escrow };
+  }
+
+  async fetchLockerV2(locker: PublicKey) {
+    try {
+      return await this.program.account.lockerV2.fetch(locker);
+    } catch (e) {
+      console.log(e);
+    }
+  }
+
+  async fetchEscrowV2(escrow: PublicKey) {
+    try {
+      return await this.program.account.escrowV2.fetch(escrow);
+    } catch (e) {
+      console.log(e);
+    }
+  }
+
+  async createInitializeEscrowV2Ix(locker: PublicKey) {
+    const [escrow] = await this.getEscrowPDA(locker);
+    const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
+
+    return [
+      Token.createAssociatedTokenAccountInstruction(
+        ASSOCIATED_TOKEN_PROGRAM_ID,
+        TOKEN_PROGRAM_ID,
+        HONEY_MINT,
+        lockedTokens,
+        escrow,
+        this.wallet.publicKey
+      ),
+      await this.program.methods
+        .initEscrowV2()
+        .accounts({
+          payer: this.wallet.publicKey,
           locker,
           escrow,
-          lockedTokens,
           escrowOwner: this.wallet.publicKey,
-          sourceTokens: source,
-          sourceTokensAuthority: this.wallet.publicKey,
-          tokenProgram: TOKEN_PROGRAM_ID
-        },
-        remainingAccounts,
-        preInstructions
+          systemProgram: anchor.web3.SystemProgram.programId
+        })
+        .instruction()
+    ];
+  }
+
+  async unlockEscrowV2(
+    locker: PublicKey,
+    escrow?: PublicKey,
+    destination?: PublicKey
+  ) {
+    if (!escrow) {
+      [escrow] = await this.getEscrowPDA(locker);
+    }
+
+    let preInstructions: anchor.web3.TransactionInstruction[] = [];
+    if (!destination) {
+      destination = await Token.getAssociatedTokenAddress(
+        ASSOCIATED_TOKEN_PROGRAM_ID,
+        TOKEN_PROGRAM_ID,
+        HONEY_MINT,
+        this.wallet.publicKey
+      );
+
+      preInstructions.push(
+        Token.createAssociatedTokenAccountInstruction(
+          ASSOCIATED_TOKEN_PROGRAM_ID,
+          TOKEN_PROGRAM_ID,
+          HONEY_MINT,
+          destination,
+          this.wallet.publicKey,
+          this.wallet.publicKey
+        )
+      );
+    }
+
+    const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
+
+    const txSig = await this.program.methods
+      .exitV2()
+      .accounts({
+        payer: this.wallet.publicKey,
+        locker,
+        escrow,
+        escrowOwner: this.wallet.publicKey,
+        lockedTokens,
+        destinationTokens: destination,
+        tokenProgram: TOKEN_PROGRAM_ID
+      })
+      .preInstructions(preInstructions)
+      .rpc();
+
+    return { txSig, destination };
+  }
+
+  async lockV2(
+    locker: PublicKey,
+    source: PublicKey,
+    amount: anchor.BN,
+    duration: anchor.BN,
+    hasEscrow?: boolean
+  ) {
+    const preInstructions = [];
+    if (!hasEscrow) {
+      preInstructions.push(...(await this.createInitializeEscrowIx(locker)));
+    }
+
+    const remainingAccounts = [
+      {
+        pubkey: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+        isSigner: false,
+        isWritable: false
+      },
+      {
+        pubkey: this.program.programId,
+        isSigner: false,
+        isWritable: false
       }
-    );
+    ];
+
+    const [escrow] = await this.getEscrowPDA(locker);
+    const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
 
+    const txSig = await this.program.methods
+      .lockV2(new anchor.BN(amount), new anchor.BN(duration))
+      .accounts({
+        locker,
+        escrow,
+        lockedTokens,
+        escrowOwner: this.wallet.publicKey,
+        sourceTokens: source,
+        sourceTokensAuthority: this.wallet.publicKey,
+        tokenProgram: TOKEN_PROGRAM_ID
+      })
+      .remainingAccounts(remainingAccounts)
+      .preInstructions(preInstructions)
+      .rpc();
     return { txSig, escrow };
   }
+
   async getEscrowPDA(locker: PublicKey) {
     return anchor.web3.PublicKey.findProgramAddress(
       [
diff --git a/helpers/types/ve_honey.ts b/helpers/types/ve_honey.ts
index 37c4e7e2..9248ea3c 100644
--- a/helpers/types/ve_honey.ts
+++ b/helpers/types/ve_honey.ts
@@ -1,3 +1,5 @@
+import { generateErrorMap } from '@saberhq/anchor-contrib';
+
 export type VeHoney = {
   version: '0.1.0';
   name: 've_honey';
@@ -44,6 +46,29 @@ export type VeHoney = {
         }
       ];
     },
+    {
+      name: 'setLockerParams';
+      accounts: [
+        {
+          name: 'admin';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'locker';
+          isMut: true;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: 'params';
+          type: {
+            defined: 'LockerParams';
+          };
+        }
+      ];
+    },
     {
       name: 'initEscrow';
       accounts: [
@@ -237,230 +262,864 @@ export type VeHoney = {
         }
       ];
       args: [];
-    }
-  ];
-  accounts: [
-    {
-      name: 'escrow';
-      type: {
-        kind: 'struct';
-        fields: [
-          {
-            name: 'locker';
-            type: 'publicKey';
-          },
-          {
-            name: 'owner';
-            type: 'publicKey';
-          },
-          {
-            name: 'bump';
-            type: 'u8';
-          },
-          {
-            name: 'tokens';
-            type: 'publicKey';
-          },
-          {
-            name: 'amount';
-            type: 'u64';
-          },
-          {
-            name: 'escrowStartedAt';
-            type: 'i64';
-          },
-          {
-            name: 'escrowEndsAt';
-            type: 'i64';
-          }
-        ];
-      };
-    },
-    {
-      name: 'locker';
-      type: {
-        kind: 'struct';
-        fields: [
-          {
-            name: 'base';
-            type: 'publicKey';
-          },
-          {
-            name: 'bump';
-            type: 'u8';
-          },
-          {
-            name: 'tokenMint';
-            type: 'publicKey';
-          },
-          {
-            name: 'lockedSupply';
-            type: 'u64';
-          },
-          {
-            name: 'admin';
-            type: 'publicKey';
-          },
-          {
-            name: 'params';
-            type: {
-              defined: 'LockerParams';
-            };
-          }
-        ];
-      };
     },
     {
-      name: 'whitelistEntry';
-      type: {
-        kind: 'struct';
-        fields: [
-          {
-            name: 'locker';
-            type: 'publicKey';
-          },
-          {
-            name: 'bump';
-            type: 'u8';
-          },
-          {
-            name: 'programId';
-            type: 'publicKey';
-          },
-          {
-            name: 'owner';
-            type: 'publicKey';
-          }
-        ];
-      };
-    }
-  ];
-  types: [
-    {
-      name: 'LockerParams';
-      type: {
-        kind: 'struct';
-        fields: [
-          {
-            name: 'minStakeDuration';
-            type: 'u64';
-          },
-          {
-            name: 'maxStakeDuration';
-            type: 'u64';
-          },
-          {
-            name: 'whitelistEnabled';
-            type: 'bool';
-          },
-          {
-            name: 'multiplier';
-            type: 'u8';
-          }
-        ];
-      };
-    }
-  ];
-  events: [
-    {
-      name: 'ExitEscrowEvent';
-      fields: [
+      name: 'migrateLocker';
+      accounts: [
         {
-          name: 'escrowOwner';
-          type: 'publicKey';
-          index: false;
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
         },
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          name: 'base';
+          isMut: false;
+          isSigner: true;
         },
         {
-          name: 'timestamp';
-          type: 'i64';
-          index: false;
+          name: 'locker';
+          isMut: false;
+          isSigner: false;
         },
         {
-          name: 'lockedSupply';
-          type: 'u64';
-          index: false;
+          name: 'newBase';
+          isMut: false;
+          isSigner: true;
         },
         {
-          name: 'releasedAmount';
-          type: 'u64';
-          index: false;
-        }
-      ];
-    },
-    {
-      name: 'InitEscrowEvent';
-      fields: [
-        {
-          name: 'escrow';
-          type: 'publicKey';
-          index: false;
+          name: 'newLocker';
+          isMut: true;
+          isSigner: false;
         },
         {
-          name: 'escrowOwner';
-          type: 'publicKey';
-          index: false;
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
         },
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          name: 'smartWallet';
+          isMut: false;
+          isSigner: false;
         },
         {
-          name: 'timestamp';
-          type: 'i64';
-          index: false;
+          name: 'systemProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: 'proposalActivationMinVotes';
+          type: 'u64';
         }
       ];
     },
     {
-      name: 'InitLockerEvent';
-      fields: [
+      name: 'migrateEscrow';
+      accounts: [
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
         },
         {
-          name: 'tokenMint';
-          type: 'publicKey';
-          index: false;
+          name: 'lockerAdmin';
+          isMut: false;
+          isSigner: true;
         },
         {
-          name: 'admin';
-          type: 'publicKey';
-          index: false;
+          name: 'oldLocker';
+          isMut: false;
+          isSigner: false;
         },
         {
-          name: 'params';
-          type: {
-            defined: 'LockerParams';
-          };
-          index: false;
-        }
-      ];
-    },
-    {
-      name: 'LockEvent';
-      fields: [
-        {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          name: 'newLocker';
+          isMut: false;
+          isSigner: false;
         },
         {
-          name: 'escrowOwner';
-          type: 'publicKey';
-          index: false;
+          name: 'oldEscrow';
+          isMut: true;
+          isSigner: false;
         },
         {
-          name: 'tokenMint';
-          type: 'publicKey';
-          index: false;
+          name: 'newEscrow';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'oldLockedTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'newLockedTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrowOwner';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'systemProgram';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'tokenProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'migrateWhitelist';
+      accounts: [
+        {
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: 'oldLocker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'newLocker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'lockerAdmin';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'whitelistEntry';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'newWhitelistEntry';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'systemProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'initLockerV2';
+      accounts: [
+        {
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: 'base';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'locker';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'tokenMint';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'systemProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: 'params';
+          type: {
+            defined: 'LockerParamsV2';
+          };
+        }
+      ];
+    },
+    {
+      name: 'initEscrowV2';
+      accounts: [
+        {
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: 'locker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'escrow';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrowOwner';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'systemProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'setLockerParamsV2';
+      accounts: [
+        {
+          name: 'locker';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'smartWallet';
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [
+        {
+          name: 'params';
+          type: {
+            defined: 'LockerParamsV2';
+          };
+        }
+      ];
+    },
+    {
+      name: 'approveProgramLockPrivilegeV2';
+      accounts: [
+        {
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: 'locker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'whitelistEntry';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'smartWallet';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'executableId';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'whitelistedOwner';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'systemProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'revokeProgramLockPrivilegeV2';
+      accounts: [
+        {
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: 'locker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'whitelistEntry';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'smartWallet';
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'lockV2';
+      accounts: [
+        {
+          name: 'locker';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrow';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'lockedTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrowOwner';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'sourceTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'sourceTokensAuthority';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'tokenProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: 'amount';
+          type: 'u64';
+        },
+        {
+          name: 'duration';
+          type: 'i64';
+        }
+      ];
+    },
+    {
+      name: 'exitV2';
+      accounts: [
+        {
+          name: 'payer';
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: 'locker';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrow';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrowOwner';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'lockedTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'destinationTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'tokenProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'activateProposal';
+      accounts: [
+        {
+          name: 'locker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'proposal';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrow';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'escrowOwner';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'governProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: 'castVote';
+      accounts: [
+        {
+          name: 'locker';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'escrow';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'voteDelegate';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'proposal';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'vote';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'governor';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'governProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: 'side';
+          type: 'u8';
+        }
+      ];
+    }
+  ];
+  accounts: [
+    {
+      name: 'escrow';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'locker';
+            type: 'publicKey';
+          },
+          {
+            name: 'owner';
+            type: 'publicKey';
+          },
+          {
+            name: 'bump';
+            type: 'u8';
+          },
+          {
+            name: 'tokens';
+            type: 'publicKey';
+          },
+          {
+            name: 'amount';
+            type: 'u64';
+          },
+          {
+            name: 'escrowStartedAt';
+            type: 'i64';
+          },
+          {
+            name: 'escrowEndsAt';
+            type: 'i64';
+          }
+        ];
+      };
+    },
+    {
+      name: 'escrowV2';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'locker';
+            type: 'publicKey';
+          },
+          {
+            name: 'owner';
+            type: 'publicKey';
+          },
+          {
+            name: 'bump';
+            type: 'u8';
+          },
+          {
+            name: 'tokens';
+            type: 'publicKey';
+          },
+          {
+            name: 'amount';
+            type: 'u64';
+          },
+          {
+            name: 'escrowStartedAt';
+            type: 'i64';
+          },
+          {
+            name: 'escrowEndsAt';
+            type: 'i64';
+          },
+          {
+            name: 'voteDelegate';
+            type: 'publicKey';
+          }
+        ];
+      };
+    },
+    {
+      name: 'locker';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'base';
+            type: 'publicKey';
+          },
+          {
+            name: 'bump';
+            type: 'u8';
+          },
+          {
+            name: 'tokenMint';
+            type: 'publicKey';
+          },
+          {
+            name: 'lockedSupply';
+            type: 'u64';
+          },
+          {
+            name: 'admin';
+            type: 'publicKey';
+          },
+          {
+            name: 'params';
+            type: {
+              defined: 'LockerParams';
+            };
+          }
+        ];
+      };
+    },
+    {
+      name: 'lockerV2';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'base';
+            type: 'publicKey';
+          },
+          {
+            name: 'bump';
+            type: 'u8';
+          },
+          {
+            name: 'tokenMint';
+            type: 'publicKey';
+          },
+          {
+            name: 'lockedSupply';
+            type: 'u64';
+          },
+          {
+            name: 'governor';
+            type: 'publicKey';
+          },
+          {
+            name: 'params';
+            type: {
+              defined: 'LockerParamsV2';
+            };
+          }
+        ];
+      };
+    },
+    {
+      name: 'whitelistEntry';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'locker';
+            type: 'publicKey';
+          },
+          {
+            name: 'bump';
+            type: 'u8';
+          },
+          {
+            name: 'programId';
+            type: 'publicKey';
+          },
+          {
+            name: 'owner';
+            type: 'publicKey';
+          }
+        ];
+      };
+    }
+  ];
+  types: [
+    {
+      name: 'LockerParams';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'minStakeDuration';
+            type: 'u64';
+          },
+          {
+            name: 'maxStakeDuration';
+            type: 'u64';
+          },
+          {
+            name: 'whitelistEnabled';
+            type: 'bool';
+          },
+          {
+            name: 'multiplier';
+            type: 'u8';
+          }
+        ];
+      };
+    },
+    {
+      name: 'LockerParamsV2';
+      type: {
+        kind: 'struct';
+        fields: [
+          {
+            name: 'minStakeDuration';
+            type: 'u64';
+          },
+          {
+            name: 'maxStakeDuration';
+            type: 'u64';
+          },
+          {
+            name: 'proposalActivationMinVotes';
+            type: 'u64';
+          },
+          {
+            name: 'whitelistEnabled';
+            type: 'bool';
+          },
+          {
+            name: 'multiplier';
+            type: 'u8';
+          }
+        ];
+      };
+    }
+  ];
+  events: [
+    {
+      name: 'ExitEscrowEvent';
+      fields: [
+        {
+          name: 'escrowOwner';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'timestamp';
+          type: 'i64';
+          index: false;
+        },
+        {
+          name: 'lockedSupply';
+          type: 'u64';
+          index: false;
+        },
+        {
+          name: 'releasedAmount';
+          type: 'u64';
+          index: false;
+        }
+      ];
+    },
+    {
+      name: 'InitEscrowEvent';
+      fields: [
+        {
+          name: 'escrow';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'escrowOwner';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'timestamp';
+          type: 'i64';
+          index: false;
+        }
+      ];
+    },
+    {
+      name: 'InitLockerEvent';
+      fields: [
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'tokenMint';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'admin';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'params';
+          type: {
+            defined: 'LockerParams';
+          };
+          index: false;
+        }
+      ];
+    },
+    {
+      name: 'InitLockerV2Event';
+      fields: [
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'tokenMint';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'governor';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'params';
+          type: {
+            defined: 'LockerParamsV2';
+          };
+          index: false;
+        }
+      ];
+    },
+    {
+      name: 'LockEvent';
+      fields: [
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'escrowOwner';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'tokenMint';
+          type: 'publicKey';
+          index: false;
         },
         {
           name: 'amount';
@@ -468,148 +1127,580 @@ export type VeHoney = {
           index: false;
         },
         {
-          name: 'lockerSupply';
-          type: 'u64';
-          index: false;
+          name: 'lockerSupply';
+          type: 'u64';
+          index: false;
+        },
+        {
+          name: 'duration';
+          type: 'i64';
+          index: false;
+        },
+        {
+          name: 'prevEscrowEndsAt';
+          type: 'i64';
+          index: false;
+        },
+        {
+          name: 'nextEscrowEndsAt';
+          type: 'i64';
+          index: false;
+        },
+        {
+          name: 'nextEscrowStartedAt';
+          type: 'i64';
+          index: false;
+        }
+      ];
+    },
+    {
+      name: 'ApproveLockPrivilegeEvent';
+      fields: [
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'programId';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'owner';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'timestamp';
+          type: 'i64';
+          index: false;
+        }
+      ];
+    },
+    {
+      name: 'RevokeLockPrivilegeEvent';
+      fields: [
+        {
+          name: 'locker';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'programId';
+          type: 'publicKey';
+          index: false;
+        },
+        {
+          name: 'timestamp';
+          type: 'i64';
+          index: false;
+        }
+      ];
+    }
+  ];
+  errors: [
+    {
+      code: 6000;
+      name: 'EscrowNotEnded';
+      msg: 'Escrow has not ended.';
+    },
+    {
+      code: 6001;
+      name: 'InvalidLockerAdmin';
+      msg: 'Invalid locker admin';
+    },
+    {
+      code: 6002;
+      name: 'LockupDurationTooShort';
+      msg: 'Lockup duration must at least be the min stake duration.';
+    },
+    {
+      code: 6003;
+      name: 'LockupDurationTooLong';
+      msg: 'Lockup duration must at most be the max stake duration.';
+    },
+    {
+      code: 6004;
+      name: 'RefreshCannotShorten';
+      msg: 'A voting escrow refresh cannot shorten the escrow time remaining.';
+    },
+    {
+      code: 6005;
+      name: 'MustProvideWhitelist';
+      msg: 'Program whitelist enabled; please provide whitelist entry and instructions sysvar';
+    },
+    {
+      code: 6006;
+      name: 'ProgramNotWhitelisted';
+      msg: 'CPI caller not whitelisted to invoke lock instruction.';
+    },
+    {
+      code: 6007;
+      name: 'EscrowOwnerNotWhitelisted';
+      msg: 'CPI caller not whitelisted for escrow owner to invoke lock instruction.';
+    },
+    {
+      code: 6008;
+      name: 'EscrowExpired';
+      msg: 'Escrow was already expired.';
+    },
+    {
+      code: 6009;
+      name: 'LockedSupplyMismatch';
+      msg: 'Token lock failed, locked supply mismatches the exact amount.';
+    },
+    {
+      code: 6010;
+      name: 'EscrowInUse';
+      msg: 'The escrow has already locked.';
+    },
+    {
+      code: 6011;
+      name: 'EscrowNoBalance';
+      msg: "The escrow doesn't have balance";
+    },
+    {
+      code: 6012;
+      name: 'ProposalMustBeActive';
+      msg: 'The proposal must be active';
+    },
+    {
+      code: 6013;
+      name: 'GovernorMismatch';
+      msg: 'Governor mismatch';
+    },
+    {
+      code: 6014;
+      name: 'ProgramIdMustBeExecutable';
+      msg: 'Program id must be executable';
+    },
+    {
+      code: 6015;
+      name: 'InsufficientVotingPower';
+      msg: 'Insufficient voting power to activate a proposal';
+    }
+  ];
+};
+
+export const IDL: VeHoney = {
+  version: '0.1.0',
+  name: 've_honey',
+  instructions: [
+    {
+      name: 'initLocker',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'base',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'tokenMint',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'systemProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: [
+        {
+          name: 'admin',
+          type: 'publicKey'
+        },
+        {
+          name: 'params',
+          type: {
+            defined: 'LockerParams'
+          }
+        }
+      ]
+    },
+    {
+      name: 'setLockerParams',
+      accounts: [
+        {
+          name: 'admin',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: true,
+          isSigner: false
+        }
+      ],
+      args: [
+        {
+          name: 'params',
+          type: {
+            defined: 'LockerParams'
+          }
+        }
+      ]
+    },
+    {
+      name: 'initEscrow',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrow',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrowOwner',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'systemProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: []
+    },
+    {
+      name: 'approveProgramLockPrivilege',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'lockerAdmin',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'whitelistEntry',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'executableId',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'whitelistedOwner',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'systemProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: []
+    },
+    {
+      name: 'revokeProgramLockPrivilege',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'lockerAdmin',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'whitelistEntry',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'executableId',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: []
+    },
+    {
+      name: 'lock',
+      accounts: [
+        {
+          name: 'locker',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrow',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'lockedTokens',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrowOwner',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'sourceTokens',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'sourceTokensAuthority',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'tokenProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: [
+        {
+          name: 'amount',
+          type: 'u64'
+        },
+        {
+          name: 'duration',
+          type: 'i64'
+        }
+      ]
+    },
+    {
+      name: 'exit',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: true,
+          isSigner: false
         },
         {
-          name: 'duration';
-          type: 'i64';
-          index: false;
+          name: 'escrow',
+          isMut: true,
+          isSigner: false
         },
         {
-          name: 'prevEscrowEndsAt';
-          type: 'i64';
-          index: false;
+          name: 'escrowOwner',
+          isMut: false,
+          isSigner: true
         },
         {
-          name: 'nextEscrowEndsAt';
-          type: 'i64';
-          index: false;
+          name: 'lockedTokens',
+          isMut: true,
+          isSigner: false
         },
         {
-          name: 'nextEscrowStartedAt';
-          type: 'i64';
-          index: false;
+          name: 'destinationTokens',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'tokenProgram',
+          isMut: false,
+          isSigner: false
         }
-      ];
+      ],
+      args: []
     },
     {
-      name: 'ApproveLockPrivilegeEvent';
-      fields: [
+      name: 'migrateLocker',
+      accounts: [
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          name: 'payer',
+          isMut: true,
+          isSigner: true
         },
         {
-          name: 'programId';
-          type: 'publicKey';
-          index: false;
+          name: 'base',
+          isMut: false,
+          isSigner: true
         },
         {
-          name: 'owner';
-          type: 'publicKey';
-          index: false;
+          name: 'locker',
+          isMut: false,
+          isSigner: false
         },
         {
-          name: 'timestamp';
-          type: 'i64';
-          index: false;
+          name: 'newBase',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'newLocker',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'governor',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'smartWallet',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'systemProgram',
+          isMut: false,
+          isSigner: false
         }
-      ];
+      ],
+      args: [
+        {
+          name: 'proposalActivationMinVotes',
+          type: 'u64'
+        }
+      ]
     },
     {
-      name: 'RevokeLockPrivilegeEvent';
-      fields: [
+      name: 'migrateEscrow',
+      accounts: [
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          name: 'payer',
+          isMut: true,
+          isSigner: true
         },
         {
-          name: 'programId';
-          type: 'publicKey';
-          index: false;
+          name: 'lockerAdmin',
+          isMut: false,
+          isSigner: true
         },
         {
-          name: 'timestamp';
-          type: 'i64';
-          index: false;
+          name: 'oldLocker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'newLocker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'oldEscrow',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'newEscrow',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'oldLockedTokens',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'newLockedTokens',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrowOwner',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'systemProgram',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'tokenProgram',
+          isMut: false,
+          isSigner: false
         }
-      ];
-    }
-  ];
-  errors: [
-    {
-      code: 6000;
-      name: 'EscrowNotEnded';
-      msg: 'Escrow has not ended.';
-    },
-    {
-      code: 6001;
-      name: 'InvalidLockerAdmin';
-      msg: 'Invalid locker admin';
-    },
-    {
-      code: 6002;
-      name: 'LockupDurationTooShort';
-      msg: 'Lockup duration must at least be the min stake duration.';
-    },
-    {
-      code: 6003;
-      name: 'LockupDurationTooLong';
-      msg: 'Lockup duration must at most be the max stake duration.';
-    },
-    {
-      code: 6004;
-      name: 'RefreshCannotShorten';
-      msg: 'A voting escrow refresh cannot shorten the escrow time remaining.';
-    },
-    {
-      code: 6005;
-      name: 'MustProvideWhitelist';
-      msg: 'Program whitelist enabled; please provide whitelist entry and instructions sysvar';
-    },
-    {
-      code: 6006;
-      name: 'ProgramNotWhitelisted';
-      msg: 'CPI caller not whitelisted to invoke lock instruction.';
-    },
-    {
-      code: 6007;
-      name: 'EscrowOwnerNotWhitelisted';
-      msg: 'CPI caller not whitelisted for escrow owner to invoke lock instruction.';
-    },
-    {
-      code: 6008;
-      name: 'EscrowExpired';
-      msg: 'Escrow was already expired.';
-    },
-    {
-      code: 6009;
-      name: 'LockedSupplyMismatch';
-      msg: 'Token lock failed, locked supply mismatches the exact amount.';
+      ],
+      args: []
     },
     {
-      code: 6010;
-      name: 'EscrowInUse';
-      msg: 'The escrow has already locked.';
+      name: 'migrateWhitelist',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'oldLocker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'newLocker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'lockerAdmin',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'whitelistEntry',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'newWhitelistEntry',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'systemProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: []
     },
     {
-      code: 6011;
-      name: 'EscrowNoBalance';
-      msg: "The escrow doesn't have balance";
-    }
-  ];
-};
-
-export const IDL: VeHoney = {
-  version: '0.1.0',
-  name: 've_honey',
-  instructions: [
-    {
-      name: 'initLocker',
+      name: 'initLockerV2',
       accounts: [
         {
           name: 'payer',
@@ -627,7 +1718,12 @@ export const IDL: VeHoney = {
           isSigner: false
         },
         {
-          name: 'tokenMint',
+          name: 'tokenMint',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'governor',
           isMut: false,
           isSigner: false
         },
@@ -638,20 +1734,16 @@ export const IDL: VeHoney = {
         }
       ],
       args: [
-        {
-          name: 'admin',
-          type: 'publicKey'
-        },
         {
           name: 'params',
           type: {
-            defined: 'LockerParams'
+            defined: 'LockerParamsV2'
           }
         }
       ]
     },
     {
-      name: 'initEscrow',
+      name: 'initEscrowV2',
       accounts: [
         {
           name: 'payer',
@@ -660,7 +1752,7 @@ export const IDL: VeHoney = {
         },
         {
           name: 'locker',
-          isMut: true,
+          isMut: false,
           isSigner: false
         },
         {
@@ -682,28 +1774,61 @@ export const IDL: VeHoney = {
       args: []
     },
     {
-      name: 'approveProgramLockPrivilege',
+      name: 'setLockerParamsV2',
       accounts: [
         {
-          name: 'payer',
+          name: 'locker',
           isMut: true,
-          isSigner: true
+          isSigner: false
         },
         {
-          name: 'locker',
+          name: 'governor',
           isMut: false,
           isSigner: false
         },
         {
-          name: 'lockerAdmin',
+          name: 'smartWallet',
           isMut: false,
           isSigner: true
+        }
+      ],
+      args: [
+        {
+          name: 'params',
+          type: {
+            defined: 'LockerParamsV2'
+          }
+        }
+      ]
+    },
+    {
+      name: 'approveProgramLockPrivilegeV2',
+      accounts: [
+        {
+          name: 'payer',
+          isMut: true,
+          isSigner: true
+        },
+        {
+          name: 'locker',
+          isMut: false,
+          isSigner: false
         },
         {
           name: 'whitelistEntry',
           isMut: true,
           isSigner: false
         },
+        {
+          name: 'governor',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'smartWallet',
+          isMut: false,
+          isSigner: true
+        },
         {
           name: 'executableId',
           isMut: false,
@@ -723,7 +1848,7 @@ export const IDL: VeHoney = {
       args: []
     },
     {
-      name: 'revokeProgramLockPrivilege',
+      name: 'revokeProgramLockPrivilegeV2',
       accounts: [
         {
           name: 'payer',
@@ -735,26 +1860,26 @@ export const IDL: VeHoney = {
           isMut: false,
           isSigner: false
         },
-        {
-          name: 'lockerAdmin',
-          isMut: false,
-          isSigner: true
-        },
         {
           name: 'whitelistEntry',
           isMut: true,
           isSigner: false
         },
         {
-          name: 'executableId',
+          name: 'governor',
           isMut: false,
           isSigner: false
+        },
+        {
+          name: 'smartWallet',
+          isMut: false,
+          isSigner: true
         }
       ],
       args: []
     },
     {
-      name: 'lock',
+      name: 'lockV2',
       accounts: [
         {
           name: 'locker',
@@ -804,7 +1929,7 @@ export const IDL: VeHoney = {
       ]
     },
     {
-      name: 'exit',
+      name: 'exitV2',
       accounts: [
         {
           name: 'payer',
@@ -843,6 +1968,88 @@ export const IDL: VeHoney = {
         }
       ],
       args: []
+    },
+    {
+      name: 'activateProposal',
+      accounts: [
+        {
+          name: 'locker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'governor',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'proposal',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrow',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'escrowOwner',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'governProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: []
+    },
+    {
+      name: 'castVote',
+      accounts: [
+        {
+          name: 'locker',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'escrow',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'voteDelegate',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'proposal',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'vote',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'governor',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'governProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: [
+        {
+          name: 'side',
+          type: 'u8'
+        }
+      ]
     }
   ],
   accounts: [
@@ -882,6 +2089,46 @@ export const IDL: VeHoney = {
         ]
       }
     },
+    {
+      name: 'escrowV2',
+      type: {
+        kind: 'struct',
+        fields: [
+          {
+            name: 'locker',
+            type: 'publicKey'
+          },
+          {
+            name: 'owner',
+            type: 'publicKey'
+          },
+          {
+            name: 'bump',
+            type: 'u8'
+          },
+          {
+            name: 'tokens',
+            type: 'publicKey'
+          },
+          {
+            name: 'amount',
+            type: 'u64'
+          },
+          {
+            name: 'escrowStartedAt',
+            type: 'i64'
+          },
+          {
+            name: 'escrowEndsAt',
+            type: 'i64'
+          },
+          {
+            name: 'voteDelegate',
+            type: 'publicKey'
+          }
+        ]
+      }
+    },
     {
       name: 'locker',
       type: {
@@ -916,6 +2163,40 @@ export const IDL: VeHoney = {
         ]
       }
     },
+    {
+      name: 'lockerV2',
+      type: {
+        kind: 'struct',
+        fields: [
+          {
+            name: 'base',
+            type: 'publicKey'
+          },
+          {
+            name: 'bump',
+            type: 'u8'
+          },
+          {
+            name: 'tokenMint',
+            type: 'publicKey'
+          },
+          {
+            name: 'lockedSupply',
+            type: 'u64'
+          },
+          {
+            name: 'governor',
+            type: 'publicKey'
+          },
+          {
+            name: 'params',
+            type: {
+              defined: 'LockerParamsV2'
+            }
+          }
+        ]
+      }
+    },
     {
       name: 'whitelistEntry',
       type: {
@@ -965,6 +2246,34 @@ export const IDL: VeHoney = {
           }
         ]
       }
+    },
+    {
+      name: 'LockerParamsV2',
+      type: {
+        kind: 'struct',
+        fields: [
+          {
+            name: 'minStakeDuration',
+            type: 'u64'
+          },
+          {
+            name: 'maxStakeDuration',
+            type: 'u64'
+          },
+          {
+            name: 'proposalActivationMinVotes',
+            type: 'u64'
+          },
+          {
+            name: 'whitelistEnabled',
+            type: 'bool'
+          },
+          {
+            name: 'multiplier',
+            type: 'u8'
+          }
+        ]
+      }
     }
   ],
   events: [
@@ -1050,6 +2359,33 @@ export const IDL: VeHoney = {
         }
       ]
     },
+    {
+      name: 'InitLockerV2Event',
+      fields: [
+        {
+          name: 'locker',
+          type: 'publicKey',
+          index: false
+        },
+        {
+          name: 'tokenMint',
+          type: 'publicKey',
+          index: false
+        },
+        {
+          name: 'governor',
+          type: 'publicKey',
+          index: false
+        },
+        {
+          name: 'params',
+          type: {
+            defined: 'LockerParamsV2'
+          },
+          index: false
+        }
+      ]
+    },
     {
       name: 'LockEvent',
       fields: [
@@ -1206,6 +2542,28 @@ export const IDL: VeHoney = {
       code: 6011,
       name: 'EscrowNoBalance',
       msg: "The escrow doesn't have balance"
+    },
+    {
+      code: 6012,
+      name: 'ProposalMustBeActive',
+      msg: 'The proposal must be active'
+    },
+    {
+      code: 6013,
+      name: 'GovernorMismatch',
+      msg: 'Governor mismatch'
+    },
+    {
+      code: 6014,
+      name: 'ProgramIdMustBeExecutable',
+      msg: 'Program id must be executable'
+    },
+    {
+      code: 6015,
+      name: 'InsufficientVotingPower',
+      msg: 'Insufficient voting power to activate a proposal'
     }
   ]
 };
+
+export const LockedVoterErrors = generateErrorMap(IDL);
diff --git a/helpers/utils.ts b/helpers/utils.ts
index 9f337b5e..78440cd7 100644
--- a/helpers/utils.ts
+++ b/helpers/utils.ts
@@ -1,6 +1,23 @@
 import { programs } from '@metaplex/js';
-import { Connection, PublicKey } from '@solana/web3.js';
+import {
+  BPF_LOADER_DEPRECATED_PROGRAM_ID,
+  BPF_LOADER_PROGRAM_ID,
+  Connection,
+  PublicKey,
+  Secp256k1Program,
+  StakeProgram,
+  SystemProgram,
+  SYSVAR_CLOCK_PUBKEY,
+  SYSVAR_RENT_PUBKEY,
+  SYSVAR_REWARDS_PUBKEY,
+  SYSVAR_STAKE_HISTORY_PUBKEY,
+  Transaction,
+  VOTE_PROGRAM_ID
+} from '@solana/web3.js';
 import * as anchor from '@project-serum/anchor';
+import type { Network } from '@saberhq/solana-contrib';
+import type { Cluster, TransactionInstruction } from '@solana/web3.js';
+import { TokenInfo } from '@saberhq/token-utils';
 
 export const convertArrayToObject = (array: any[], key: string) => {
   const initialValue = {};
@@ -92,3 +109,265 @@ export const convertToBN = (
 
   return new anchor.BN(amount).mul(wads).add(new anchor.BN(mod));
 };
+
+export const serializeToBase64 = (tx: Transaction): string =>
+  tx
+    .serialize({
+      requireAllSignatures: false,
+      verifySignatures: false
+    })
+    .toString('base64');
+
+export const makeTransaction = (
+  network: Network,
+  ixs: TransactionInstruction[]
+): Transaction => {
+  const tx = new Transaction();
+  tx.recentBlockhash = 'GfVcyD4kkTrj4bKc7WA9sZCin9JDbdT4Zkd3EittNR1W';
+  tx.feePayer =
+    network === 'devnet'
+      ? new PublicKey('A2jaCHPzD6346348JoEym2KFGX9A7uRBw6AhCdX7gTWP')
+      : new PublicKey('9u9iZBWqGsp5hXBxkVZtBTuLSGNAG9gEQLgpuVw39ASg');
+  tx.instructions = ixs;
+  return tx;
+};
+
+/**
+ * Generates a link for inspecting the contents of a transaction.
+ *
+ * @returns URL
+ */
+export const generateInspectLink = (
+  cluster: Cluster,
+  tx: Transaction
+): string => {
+  return `https://anchor.so/tx/inspector?cluster=${cluster}&message=${encodeURIComponent(
+    serializeToBase64(tx)
+  )}`;
+};
+
+export enum PROGRAM_NAMES {
+  // native built-ins
+  ADDRESS_MAP = 'Address Map Program',
+  CONFIG = 'Config Program',
+  STAKE = 'Stake Program',
+  SYSTEM = 'System Program',
+  VOTE = 'Vote Program',
+  SECP256K1 = 'Secp256k1 Program',
+
+  // spl
+  ASSOCIATED_TOKEN = 'Associated Token Program',
+  FEATURE_PROPOSAL = 'Feature Proposal Program',
+  LENDING = 'Lending Program',
+  MEMO = 'Memo Program',
+  MEMO_2 = 'Memo Program v2',
+  NAME = 'Name Service Program',
+  STAKE_POOL = 'Stake Pool Program',
+  SWAP = 'Swap Program',
+  TOKEN = 'Token Program',
+  TOKEN_METADATA = 'Token Metadata Program',
+  TOKEN_VAULT = 'Token Vault Program',
+
+  // other
+  ACUMEN = 'Acumen Program',
+  BONFIDA_POOL = 'Bonfida Pool Program',
+  BREAK_SOLANA = 'Break Solana Program',
+  MANGO_GOVERNANCE = 'Mango Governance Program',
+  MANGO_ICO = 'Mango ICO Program',
+  MANGO_1 = 'Mango Program v1',
+  MANGO_2 = 'Mango Program v2',
+  MANGO_3 = 'Mango Program v3',
+  MARINADE = 'Marinade Staking Program',
+  MERCURIAL = 'Mercurial Stable Swap Program',
+  METAPLEX = 'Metaplex Program',
+  NFT_AUCTION = 'NFT Auction Program',
+  NFT_CANDY_MACHINE = 'NFT Candy Machine Program',
+  ORCA_SWAP_1 = 'Orca Swap Program v1',
+  ORCA_SWAP_2 = 'Orca Swap Program v2',
+  ORCA_AQUAFARM = 'Orca Aquafarm Program',
+  PORT = 'Port Finance Program',
+  PYTH = 'Pyth Oracle Program',
+  QUARRY_MERGE_MINE = 'Quarry Merge Mine',
+  QUARRY_MINE = 'Quarry Mine',
+  QUARRY_MINT_WRAPPER = 'Quarry Mint Wrapper',
+  QUARRY_REDEEMER = 'Quarry Redeemer',
+  QUARRY_REGISTRY = 'Quarry Registry',
+  RAYDIUM_AMM = 'Raydium AMM Program',
+  RAYDIUM_IDO = 'Raydium IDO Program',
+  RAYDIUM_LP_1 = 'Raydium Liquidity Pool Program v1',
+  RAYDIUM_LP_2 = 'Raydium Liquidity Pool Program v2',
+  RAYDIUM_STAKING = 'Raydium Staking Program',
+  SABER_ROUTER = 'Saber Router Program',
+  SABER_SWAP = 'Saber Stable Swap Program',
+  SERUM_1 = 'Serum Dex Program v1',
+  SERUM_2 = 'Serum Dex Program v2',
+  SERUM_3 = 'Serum Dex Program v3',
+  SERUM_SWAP = 'Serum Swap Program',
+  SOLEND = 'Solend Program',
+  SOLIDO = 'Lido for Solana Program',
+  STEP_SWAP = 'Step Finance Swap Program',
+  SWITCHBOARD = 'Switchboard Oracle Program',
+  WORMHOLE = 'Wormhole'
+}
+
+export const KNOWN_NON_ANCHOR_PROGRAMS = new Set(
+  Object.keys({
+    // native built-ins
+    AddressMap111111111111111111111111111111111: PROGRAM_NAMES.ADDRESS_MAP,
+    Config1111111111111111111111111111111111111: PROGRAM_NAMES.CONFIG,
+    [StakeProgram.programId.toBase58()]: PROGRAM_NAMES.STAKE,
+    [SystemProgram.programId.toBase58()]: PROGRAM_NAMES.SYSTEM,
+    [VOTE_PROGRAM_ID.toBase58()]: PROGRAM_NAMES.VOTE,
+    [Secp256k1Program.programId.toBase58()]: PROGRAM_NAMES.SECP256K1,
+
+    // spl
+    ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL:
+      PROGRAM_NAMES.ASSOCIATED_TOKEN,
+    Feat1YXHhH6t1juaWF74WLcfv4XoNocjXA6sPWHNgAse:
+      PROGRAM_NAMES.FEATURE_PROPOSAL,
+    LendZqTs7gn5CTSJU1jWKhKuVpjJGom45nnwPb2AMTi: PROGRAM_NAMES.LENDING,
+    Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo: PROGRAM_NAMES.MEMO,
+    MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr: PROGRAM_NAMES.MEMO_2,
+    namesLPneVptA9Z5rqUDD9tMTWEJwofgaYwp8cawRkX: PROGRAM_NAMES.NAME,
+    SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy: PROGRAM_NAMES.STAKE_POOL,
+    SwaPpA9LAaLfeLi3a68M4DjnLqgtticKg6CnyNwgAC8: PROGRAM_NAMES.SWAP,
+    TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA: PROGRAM_NAMES.TOKEN
+  })
+);
+export const PROGRAM_NAME_BY_ID = {
+  // native built-ins
+  AddressMap111111111111111111111111111111111: PROGRAM_NAMES.ADDRESS_MAP,
+  Config1111111111111111111111111111111111111: PROGRAM_NAMES.CONFIG,
+  [StakeProgram.programId.toBase58()]: PROGRAM_NAMES.STAKE,
+  [SystemProgram.programId.toBase58()]: PROGRAM_NAMES.SYSTEM,
+  [VOTE_PROGRAM_ID.toBase58()]: PROGRAM_NAMES.VOTE,
+  [Secp256k1Program.programId.toBase58()]: PROGRAM_NAMES.SECP256K1,
+
+  // spl
+  ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL: PROGRAM_NAMES.ASSOCIATED_TOKEN,
+  Feat1YXHhH6t1juaWF74WLcfv4XoNocjXA6sPWHNgAse: PROGRAM_NAMES.FEATURE_PROPOSAL,
+  LendZqTs7gn5CTSJU1jWKhKuVpjJGom45nnwPb2AMTi: PROGRAM_NAMES.LENDING,
+  Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo: PROGRAM_NAMES.MEMO,
+  MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr: PROGRAM_NAMES.MEMO_2,
+  namesLPneVptA9Z5rqUDD9tMTWEJwofgaYwp8cawRkX: PROGRAM_NAMES.NAME,
+  SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy: PROGRAM_NAMES.STAKE_POOL,
+  SwaPpA9LAaLfeLi3a68M4DjnLqgtticKg6CnyNwgAC8: PROGRAM_NAMES.SWAP,
+  TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA: PROGRAM_NAMES.TOKEN,
+  metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s: PROGRAM_NAMES.TOKEN_METADATA,
+  vau1zxA2LbssAUEF7Gpw91zMM1LvXrvpzJtmZ58rPsn: PROGRAM_NAMES.TOKEN_VAULT,
+
+  // other
+  C64kTdg1Hzv5KoQmZrQRcm2Qz7PkxtFBgw7EpFhvYn8W: PROGRAM_NAMES.ACUMEN,
+  WvmTNLpGMVbwJVYztYL4Hnsy82cJhQorxjnnXcRm3b6: PROGRAM_NAMES.BONFIDA_POOL,
+  BrEAK7zGZ6dM71zUDACDqJnekihmwF15noTddWTsknjC: PROGRAM_NAMES.BREAK_SOLANA,
+  GqTPL6qRf5aUuqscLh8Rg2HTxPUXfhhAXDptTLhp1t2J: PROGRAM_NAMES.MANGO_GOVERNANCE,
+  '7sPptkymzvayoSbLXzBsXEF8TSf3typNnAWkrKrDizNb': PROGRAM_NAMES.MANGO_ICO,
+  JD3bq9hGdy38PuWQ4h2YJpELmHVGPPfFSuFkpzAd9zfu: PROGRAM_NAMES.MANGO_1,
+  '5fNfvyp5czQVX77yoACa3JJVEhdRaWjPuazuWgjhTqEH': PROGRAM_NAMES.MANGO_2,
+  mv3ekLzLbnVPNxjSKvqBpU3ZeZXPQdEC3bp5MDEBG68: PROGRAM_NAMES.MANGO_3,
+  MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD: PROGRAM_NAMES.MARINADE,
+  MERLuDFBMmsHnsBPZw2sDQZHvXFMwp8EdjudcU2HKky: PROGRAM_NAMES.MERCURIAL,
+  p1exdMJcjVao65QdewkaZRUnU6VPSXhus9n2GzWfh98: PROGRAM_NAMES.METAPLEX,
+  auctxRXPeJoc4817jDhf4HbjnhEcr1cCXenosMhK5R8: PROGRAM_NAMES.NFT_AUCTION,
+  cndyAnrLdpjq1Ssp1z8xxDsB8dxe7u4HL5Nxi2K5WXZ: PROGRAM_NAMES.NFT_CANDY_MACHINE,
+  DjVE6JNiYqPL2QXyCUUh8rNjHrbz9hXHNYt99MQ59qw1: PROGRAM_NAMES.ORCA_SWAP_1,
+  '9W959DqEETiGZocYWCQPaJ6sBmUzgfxXfqGeTEdp3aQP': PROGRAM_NAMES.ORCA_SWAP_2,
+  '82yxjeMsvaURa4MbZZ7WZZHfobirZYkH1zF8fmeGtyaQ': PROGRAM_NAMES.ORCA_AQUAFARM,
+  Port7uDYB3wk6GJAw4KT1WpTeMtSu9bTcChBHkX2LfR: PROGRAM_NAMES.PORT,
+  FsJ3A3u2vn5cTVofAjvy6y5kwABJAqYWpe4975bi2epH: PROGRAM_NAMES.PYTH,
+  QMMD16kjauP5knBwxNUJRZ1Z5o3deBuFrqVjBVmmqto: PROGRAM_NAMES.QUARRY_MERGE_MINE,
+  QMNeHCGYnLVDn1icRAfQZpjPLBNkfGbSKRB83G5d8KB: PROGRAM_NAMES.QUARRY_MINE,
+  QMWoBmAyJLAsA1Lh9ugMTw2gciTihncciphzdNzdZYV:
+    PROGRAM_NAMES.QUARRY_MINT_WRAPPER,
+  QRDxhMw1P2NEfiw5mYXG79bwfgHTdasY2xNP76XSea9: PROGRAM_NAMES.QUARRY_REDEEMER,
+  QREGBnEj9Sa5uR91AV8u3FxThgP5ZCvdZUW2bHAkfNc: PROGRAM_NAMES.QUARRY_REGISTRY,
+  '675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8': PROGRAM_NAMES.RAYDIUM_AMM,
+  '9HzJyW1qZsEiSfMUf6L2jo3CcTKAyBmSyKdwQeYisHrC': PROGRAM_NAMES.RAYDIUM_IDO,
+  RVKd61ztZW9GUwhRbbLoYVRE5Xf1B2tVscKqwZqXgEr: PROGRAM_NAMES.RAYDIUM_LP_1,
+  '27haf8L6oxUeXrHrgEgsexjSY5hbVUWEmvv9Nyxg8vQv': PROGRAM_NAMES.RAYDIUM_LP_2,
+  EhhTKczWMGQt46ynNeRX1WfeagwwJd7ufHvCDjRxjo5Q: PROGRAM_NAMES.RAYDIUM_STAKING,
+  Crt7UoUR6QgrFrN7j8rmSQpUTNWNSitSwWvsWGf1qZ5t: PROGRAM_NAMES.SABER_ROUTER,
+  SSwpkEEcbUqx4vtoEByFjSkhKdCT862DNVb52nZg1UZ: PROGRAM_NAMES.SABER_SWAP,
+  BJ3jrUzddfuSrZHXSCxMUUQsjKEyLmuuyZebkcaFp2fg: PROGRAM_NAMES.SERUM_1,
+  EUqojwWA2rd19FZrzeBncJsm38Jm1hEhE3zsmX3bRc2o: PROGRAM_NAMES.SERUM_2,
+  '9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin': PROGRAM_NAMES.SERUM_3,
+  '22Y43yTVxuUkoRKdm9thyRhQ3SdgQS7c7kB6UNCiaczD': PROGRAM_NAMES.SERUM_SWAP,
+  So1endDq2YkqhipRh3WViPa8hdiSpxWy6z3Z6tMCpAo: PROGRAM_NAMES.SOLEND,
+  CrX7kMhLC3cSsXJdT7JDgqrRVWGnUpX3gfEfxxU2NVLi: PROGRAM_NAMES.SOLIDO,
+  SSwpMgqNDsyV7mAgN9ady4bDVu5ySjmmXejXvy2vLt1: PROGRAM_NAMES.STEP_SWAP,
+  DtmE9D2CSB4L5D6A15mraeEjrGMm6auWVzgaD8hK2tZM: PROGRAM_NAMES.SWITCHBOARD,
+  WormT3McKhFJ2RkiGpdw9GKvNCrB2aB54gb2uV9MfQC: PROGRAM_NAMES.WORMHOLE
+} as const;
+
+export type LoaderName = typeof LOADER_IDS[keyof typeof LOADER_IDS];
+export const LOADER_IDS = {
+  MoveLdr111111111111111111111111111111111111: 'Move Loader',
+  NativeLoader1111111111111111111111111111111: 'Native Loader',
+  [BPF_LOADER_DEPRECATED_PROGRAM_ID.toBase58()]: 'BPF Loader',
+  [BPF_LOADER_PROGRAM_ID.toBase58()]: 'BPF Loader 2',
+  BPFLoaderUpgradeab1e11111111111111111111111: 'BPF Upgradeable Loader'
+} as const;
+
+export function programLabel(address: string): string | undefined {
+  const programName = PROGRAM_NAME_BY_ID[address];
+  return programName ?? LOADER_IDS[address];
+}
+
+export const SYSVAR_IDS = {
+  [SYSVAR_CLOCK_PUBKEY.toBase58()]: 'Sysvar: Clock',
+  SysvarEpochSchedu1e111111111111111111111111: 'Sysvar: Epoch Schedule',
+  SysvarFees111111111111111111111111111111111: 'Sysvar: Fees',
+  SysvarRecentB1ockHashes11111111111111111111: 'Sysvar: Recent Blockhashes',
+  [SYSVAR_RENT_PUBKEY.toBase58()]: 'Sysvar: Rent',
+  [SYSVAR_REWARDS_PUBKEY.toBase58()]: 'Sysvar: Rewards',
+  SysvarS1otHashes111111111111111111111111111: 'Sysvar: Slot Hashes',
+  SysvarS1otHistory11111111111111111111111111: 'Sysvar: Slot History',
+  [SYSVAR_STAKE_HISTORY_PUBKEY.toBase58()]: 'Sysvar: Stake History',
+  Sysvar1nstructions1111111111111111111111111: 'Sysvar: Instructions'
+};
+
+export const SPECIAL_IDS: { [key: string]: string } = {
+  '1nc1nerator11111111111111111111111111111111': 'Incinerator',
+  Sysvar1111111111111111111111111111111111111: 'SYSVAR'
+};
+
+export function tokenLabel(
+  address: string,
+  tokenRegistry?: Map<string, TokenInfo>
+): string | undefined {
+  if (!tokenRegistry) return;
+  const tokenInfo = tokenRegistry.get(address);
+  if (!tokenInfo) return;
+  if (tokenInfo.name === tokenInfo.symbol) {
+    return tokenInfo.name;
+  }
+  return `${tokenInfo.symbol} - ${tokenInfo.name}`;
+}
+
+/**
+ * shorten the checksummed version of the input address to have 4 characters at start and end
+ * @param address
+ * @param chars
+ * @returns
+ */
+export function shortenAddress(address: string, chars = 5): string {
+  return `${address.substring(0, chars)}...${address.substring(
+    address.length - chars
+  )}`;
+}
+
+export function addressLabel(
+  address: string,
+  tokenRegistry?: Map<string, TokenInfo>
+): string | undefined {
+  return (
+    programLabel(address) ||
+    SYSVAR_IDS[address] ||
+    SPECIAL_IDS[address] ||
+    tokenLabel(address, tokenRegistry)
+  );
+}
+
+export function displayAddress(address: string, shorten = true): string {
+  return addressLabel(address) ?? (shorten ? shortenAddress(address) : address);
+}
diff --git a/helpers/validators/pubkey.ts b/helpers/validators/pubkey.ts
new file mode 100644
index 00000000..cf08a27b
--- /dev/null
+++ b/helpers/validators/pubkey.ts
@@ -0,0 +1,49 @@
+import { Keypair, PublicKey } from "@solana/web3.js";
+import { coerce, instance, string } from "superstruct";
+import * as Yup from "yup";
+
+export const PublicKeyFromString = coerce(
+  instance(PublicKey),
+  string(),
+  (value) => new PublicKey(value)
+);
+
+/**
+ * Yup validator for a PublicKey.
+ */
+export const YupPublicKey = Yup.string().test(
+  "Public Key",
+  "Invalid public key",
+  (str) => {
+    if (!str) {
+      return true;
+    }
+    try {
+      new PublicKey(str);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+);
+
+export const YupKeypair = Yup.string().test(
+  "Keypair",
+  "Invalid keypair JSON",
+  (str) => {
+    if (!str) {
+      return true;
+    }
+    try {
+      return !!kpSeedToKP(str);
+    } catch (e) {
+      return false;
+    }
+  }
+);
+
+export const kpSeedToKP = (secretKey: string): Keypair => {
+  return Keypair.fromSecretKey(
+    Uint8Array.from(JSON.parse(secretKey) as number[])
+  );
+};
diff --git a/hooks/deploydao/stripTrailingNullBytes.ts b/hooks/deploydao/stripTrailingNullBytes.ts
new file mode 100644
index 00000000..42f4892b
--- /dev/null
+++ b/hooks/deploydao/stripTrailingNullBytes.ts
@@ -0,0 +1,9 @@
+export const stripTrailingNullBytes = (data: Buffer): Buffer => {
+  // need to call this in order to not mutate the original buffer
+  const reversed = Uint8Array.prototype.slice.call(data).reverse();
+  const lastNonNullByte =
+    reversed.length - reversed.findIndex((b) => b !== 0) - 1;
+  return Buffer.from(
+    Uint8Array.prototype.slice.call(data, 0, lastNonNullByte + 1)
+  );
+};
diff --git a/hooks/deploydao/types.ts b/hooks/deploydao/types.ts
new file mode 100644
index 00000000..851a1a87
--- /dev/null
+++ b/hooks/deploydao/types.ts
@@ -0,0 +1,174 @@
+/**
+ * Identifier of a verified program build.
+ */
+export interface Build {
+  slug: string;
+  org: string;
+  repoName: string;
+  source: string;
+  tag: string;
+}
+
+/**
+ * Miscellaneous information about a build.
+ */
+export interface BuildInfo {
+  anchorVersion: string;
+  createdAt: string;
+  repo: string;
+  tag: string;
+  slug: string;
+}
+
+/**
+ * Information about an individual build artifact.
+ */
+export interface ArtifactInfo {
+  /**
+   * Relative path of the artifact.
+   */
+  path: string;
+  /**
+   * Size of the artifact, in bytes.
+   */
+  size: number | null;
+  /**
+   * Artifact checksum.
+   */
+  checksum: string;
+  /**
+   * URL for downloading the artifact.
+   */
+  downloadURL: string;
+}
+
+/**
+ * A verified organization in `organizations.yml`.
+ */
+export interface VerifiedOrganization {
+  name: string;
+  github: string;
+  website?: string;
+}
+
+export interface Author {
+  /**
+   * GitHub username/organization name.
+   */
+  name: string;
+  /**
+   * Verified info from `organizations.yml`.
+   */
+  info: VerifiedOrganization | null;
+}
+
+/**
+ * Full description of a verified program build.
+ */
+export interface BuildDetails {
+  /**
+   * The Build.
+   */
+  build: Build;
+  /**
+   * Addresses of programs covered by the build.
+   */
+  addresses: Record<string, string>;
+  /**
+   * Build information.
+   */
+  info: BuildInfo | null;
+  /**
+   * List of all artifacts generated during this build and their file sizes.
+   */
+  artifacts: ArtifactInfo[];
+  /**
+   * Link to the workspace where the build took place.
+   */
+  workspaceURL: string;
+  /**
+   * Author of the build.
+   */
+  author: Author;
+}
+
+/**
+ * Information about a program published to the registry.
+ */
+export interface ProgramInfo {
+  /**
+   * Unique identifier of the program.
+   *
+   * This should be `$slug-$programName`.
+   */
+  id: string;
+  /**
+   * Name of the program, unscoped.
+   */
+  name: string;
+  /**
+   * Verified information about the organization, if applicable.
+   */
+  author: Author;
+  /**
+   * Rendered label for the program.
+   */
+  label: string;
+  /**
+   * Program address.
+   */
+  address: string;
+  /**
+   * GitHub information.
+   */
+  github: {
+    organization: string;
+    repo: string;
+  };
+}
+
+/**
+ * A verifiable program build.
+ */
+export interface VerifiableProgramRelease {
+  /**
+   * Globally unique identifier for the release.
+   *
+   * This is in the form of `@$org/$programName@$tag`.
+   */
+  id: string;
+  /**
+   * The program.
+   */
+  program: ProgramInfo;
+  /**
+   * The build artifact.
+   */
+  artifact: ArtifactInfo;
+  /**
+   * The trimmed build artifact. Its checksum is used to generate
+   */
+  trimmedArtifact: ArtifactInfo;
+  /**
+   * The IDL artifact.
+   */
+  idl: ArtifactInfo | null;
+  /**
+   * Full description of the build.
+   */
+  build: BuildDetails;
+}
+
+/**
+ * All information about a program.
+ */
+export interface ProgramDetails {
+  /**
+   * Program info.
+   */
+  program: ProgramInfo;
+  /**
+   * All known releases.
+   */
+  releases: VerifiableProgramRelease[];
+}
diff --git a/hooks/deploydao/useCanonicalVerifiableBuild.ts b/hooks/deploydao/useCanonicalVerifiableBuild.ts
new file mode 100644
index 00000000..08653bb8
--- /dev/null
+++ b/hooks/deploydao/useCanonicalVerifiableBuild.ts
@@ -0,0 +1,19 @@
+import { fetchNullableWithSessionCache } from "@saberhq/sail";
+import { useQuery } from "react-query";
+
+import type { VerifiableProgramRelease } from "./types";
+
+export const fetchCanonicalVerifiableBuild = async (checksum: string) => {
+  if (!checksum) {
+    return null;
+  }
+  return await fetchNullableWithSessionCache<VerifiableProgramRelease>(
+    `https://raw.githubusercontent.com/DeployDAO/solana-program-index/master/releases/by-trimmed-checksum/${checksum}.json`
+  );
+};
+
+export const useCanonicalVerifiableBuild = (checksum: string) => {
+  return useQuery(["canonicalVerifiableBuild", checksum], async () => {
+    return fetchCanonicalVerifiableBuild(checksum);
+  });
+};
diff --git a/hooks/deploydao/useProgramData.ts b/hooks/deploydao/useProgramData.ts
new file mode 100644
index 00000000..21717d44
--- /dev/null
+++ b/hooks/deploydao/useProgramData.ts
@@ -0,0 +1,57 @@
+import type { AccountParser } from "@saberhq/sail";
+import { useAccountData, useParsedAccountData } from "@saberhq/sail";
+import { u64 } from "@saberhq/token-utils";
+import { PublicKey } from "@solana/web3.js";
+import { useMemo } from "react";
+
+import { stripTrailingNullBytes } from "./stripTrailingNullBytes";
+
+const programDataParser: AccountParser<{
+  data: Buffer;
+  upgradeAuthority: PublicKey;
+  lastDeployedSlot: u64;
+}> = (info) => {
+  const lastDeployedSlot = u64.fromBuffer(
+    info.accountInfo.data.slice(4, 4 + 8)
+  );
+  const upgradeAuthority = new PublicKey(
+    info.accountInfo.data.slice(4 + 8 + 1, 4 + 8 + 1 + 32)
+  );
+  const data = info.accountInfo.data.slice(4 + 8 + 1 + 32);
+  return {
+    data,
+    lastDeployedSlot,
+    upgradeAuthority,
+  };
+};
+
+export const useProgramData = (programID: PublicKey) => {
+  const { data: program } = useAccountData(programID);
+
+  const programDataAddress = useMemo(() => {
+    if (!program) {
+      return program;
+    }
+    const data = program.accountInfo.data;
+    const programDataAddress = data.slice(4, 32 + 4);
+    return new PublicKey(programDataAddress);
+  }, [program]);
+
+  const { data: programData } = useParsedAccountData(
+    programDataAddress,
+    programDataParser
+  );
+
+  const canonicalData = useMemo(() => {
+    if (!programData) {
+      return programData;
+    }
+    const data = programData.accountInfo.data.data;
+    return stripTrailingNullBytes(data);
+  }, [programData]);
+
+  return {
+    programData,
+    canonicalData,
+  };
+};
diff --git a/hooks/deploydao/useProgramIndex.ts b/hooks/deploydao/useProgramIndex.ts
new file mode 100644
index 00000000..c813f76e
--- /dev/null
+++ b/hooks/deploydao/useProgramIndex.ts
@@ -0,0 +1,21 @@
+import { PublicKey } from "@solana/web3.js";
+import { useQuery } from "react-query";
+
+import type { ProgramInfo } from "./types";
+
+interface ProgramInfoParsed extends Omit<ProgramInfo, "address"> {
+  address: PublicKey;
+}
+
+export const useProgramIndex = () => {
+  return useQuery(
+    ["solanaProgramIndex"],
+    async (): Promise<ProgramInfoParsed[]> => {
+      const result = await fetch(
+        "https://raw.githubusercontent.com/DeployDAO/solana-program-index/master/programs.json"
+      );
+      const parsed = (await result.json()) as ProgramInfo[];
+      return parsed.map((p) => ({ ...p, address: new PublicKey(p.address) }));
+    }
+  );
+};
diff --git a/hooks/deploydao/useProgramMeta.ts b/hooks/deploydao/useProgramMeta.ts
new file mode 100644
index 00000000..cd668759
--- /dev/null
+++ b/hooks/deploydao/useProgramMeta.ts
@@ -0,0 +1,29 @@
+import { fetchNullableWithSessionCache } from "@saberhq/sail";
+import { useMemo } from "react";
+import { useQueries } from "react-query";
+import invariant from "tiny-invariant";
+
+import type { ProgramDetails } from "./types";
+
+export const useProgramMetas = (addresses: (string | null | undefined)[]) => {
+  return useQueries(
+    addresses.map((pid) => ({
+      queryKey: ["sprMeta", pid],
+      queryFn: async (): Promise<ProgramDetails | null> => {
+        if (!pid) {
+          return null;
+        }
+        return await fetchNullableWithSessionCache<ProgramDetails>(
+          `https://raw.githubusercontent.com/DeployDAO/solana-program-index/master/programs/${pid}.json`
+        );
+      },
+      enabled: !!pid,
+    }))
+  );
+};
+
+export const useProgramMeta = (address: string | null | undefined) => {
+  const result = useProgramMetas(useMemo(() => [address], [address]))[0];
+  invariant(result);
+  return result;
+};
diff --git a/hooks/deploydao/useProgramRelease.ts b/hooks/deploydao/useProgramRelease.ts
new file mode 100644
index 00000000..d052d836
--- /dev/null
+++ b/hooks/deploydao/useProgramRelease.ts
@@ -0,0 +1,20 @@
+import { useQuery } from "react-query";
+
+import type { VerifiableProgramRelease } from "./types";
+
+export const useProgramRelease = (
+  org: string,
+  programName: string,
+  version: string
+) => {
+  return useQuery(["programRelease", org, programName, version], async () => {
+    const result = await fetch(
+      `https://raw.githubusercontent.com/DeployDAO/solana-program-index/master/releases/by-name/%40${org}/${programName}%40${version}.json`
+    );
+    if (result.status === 404) {
+      return null;
+    }
+    const parsed = (await result.json()) as VerifiableProgramRelease;
+    return parsed;
+  });
+};
diff --git a/hooks/tribeca/useEscrow.ts b/hooks/tribeca/useEscrow.ts
new file mode 100644
index 00000000..a92b87b8
--- /dev/null
+++ b/hooks/tribeca/useEscrow.ts
@@ -0,0 +1,99 @@
+import { TokenAmount } from '@saberhq/token-utils';
+import { useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import { findEscrowAddress, VoteEscrow } from '@tribecahq/tribeca-sdk';
+import { useEscrowData, useLockerData } from 'helpers/parser';
+import { useSDK } from 'helpers/sdk';
+import { useEffect } from 'react';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import { useGovernor } from './useGovernor';
+
+export const useLocker = () => {
+  const { governorData } = useGovernor();
+  const lockerKey = governorData
+    ? governorData.account.electorate
+    : governorData;
+  return useLockerData(lockerKey);
+};
+
+export const useEscrow = (owner?: PublicKey) => {
+  const { tribecaMut } = useSDK();
+  const { network, wallet } = useSolana();
+  const { governorData, governor, veToken, govToken } = useGovernor();
+  const lockerKey = governorData
+    ? governorData.account.electorate
+    : governorData;
+
+  const { data: escrowKey } = useQuery(
+    ['escrowKey', network, lockerKey?.toString(), owner?.toString()],
+    async () => {
+      invariant(lockerKey && owner);
+      const [escrowKey] = await findEscrowAddress(lockerKey, owner);
+      return escrowKey;
+    },
+    {
+      enabled: !!(lockerKey && owner)
+    }
+  );
+  const { data: escrow, isLoading: isEscrowLoading } = useEscrowData(escrowKey);
+
+  const canLoadEscrow =
+    !!governorData && !!(lockerKey && owner && tribecaMut && escrow);
+  const result = useQuery(
+    ['escrow', escrow?.publicKey.toString()],
+    async () => {
+      invariant(lockerKey && owner && tribecaMut && escrow);
+      const escrowW = new VoteEscrow(
+        tribecaMut,
+        lockerKey,
+        governor,
+        escrow.publicKey,
+        owner
+      );
+      return {
+        escrow: escrow.account,
+        escrowW,
+        calculateVotingPower: await escrowW.makeCalculateVotingPower()
+      };
+    },
+    {
+      enabled: canLoadEscrow
+    }
+  );
+
+  const { refetch } = result;
+  useEffect(() => {
+    if (canLoadEscrow) {
+      void refetch();
+    }
+  }, [canLoadEscrow, escrow, refetch]);
+
+  const veBalance =
+    veToken && result.data
+      ? new TokenAmount(
+          veToken,
+          result.data.calculateVotingPower(new Date().getTime() / 1_000)
+        )
+      : null;
+
+  const govTokensLocked =
+    wallet && govToken
+      ? new TokenAmount(govToken, result.data ? result.data.escrow.amount : 0)
+      : null;
+
+  return {
+    ...result,
+    isEscrowLoading,
+    veBalance,
+    govTokensLocked,
+    escrow: escrow === null ? null : result.data,
+    escrowKey
+  };
+};
+
+export const useUserEscrow = () => {
+  const { tribecaMut } = useSDK();
+  return useEscrow(tribecaMut?.provider.wallet.publicKey);
+};
diff --git a/hooks/tribeca/useExecutiveCouncil.ts b/hooks/tribeca/useExecutiveCouncil.ts
new file mode 100644
index 00000000..5a22a436
--- /dev/null
+++ b/hooks/tribeca/useExecutiveCouncil.ts
@@ -0,0 +1,92 @@
+import { findSubaccountInfoAddress } from '@gokiprotocol/client';
+import { useTXHandlers } from '@saberhq/sail';
+import { TransactionEnvelope } from '@saberhq/solana-contrib';
+import { useMemo } from 'react';
+import { useQuery } from 'react-query';
+import {
+  useBatchedSubaccountInfos,
+  useGokiSmartWalletData
+} from 'helpers/parser';
+import { useOwnerInvokerAddress } from '../useSmartWalletAddress';
+import { useGovernor } from './useGovernor';
+import { useSDK } from 'helpers/sdk';
+
+export const useExecutiveCouncil = () => {
+  const { smartWallet } = useGovernor();
+  const { data: smartWalletData } = useGokiSmartWalletData(smartWallet);
+  const { sdkMut } = useSDK();
+  const { signAndConfirmTX } = useTXHandlers();
+
+  const { data: subaccountInfoKeys } = useQuery(
+    ['subaccountInfos', smartWalletData?.publicKey.toString()],
+    async () => {
+      if (!smartWalletData) {
+        return smartWalletData;
+      }
+      return await Promise.all(
+        smartWalletData.account.owners.map(async swOwner => {
+          const [sub] = await findSubaccountInfoAddress(swOwner);
+          return sub;
+        })
+      );
+    },
+    {
+      enabled: !!smartWalletData
+    }
+  );
+
+  const { data: subaccountInfos } =
+    useBatchedSubaccountInfos(subaccountInfoKeys);
+
+  const subaccountInfo = useMemo(
+    () =>
+      subaccountInfos?.find(
+        s => s && 'ownerInvoker' in s.account.subaccountType
+      ),
+    [subaccountInfos]
+  );
+
+  const ecKey = subaccountInfo?.account.smartWallet;
+  const ecWallet = useGokiSmartWalletData(ecKey);
+
+  const { data: ownerInvokerKey } = useOwnerInvokerAddress(ecKey, 0);
+
+  const isMemberOfEC = !!(
+    sdkMut &&
+    ecWallet.data?.account.owners.find(o =>
+      o.equals(sdkMut.provider.wallet.publicKey)
+    )
+  );
+
+  const buildOwnerInvokeTX = async (tx: TransactionEnvelope) => {
+    if (!isMemberOfEC || !ecWallet.data || !subaccountInfo) {
+      throw new Error('Not a member of the Executive Council');
+    }
+    const sw = await sdkMut.loadSmartWallet(ecWallet.data?.publicKey);
+    const allTXs = await Promise.all(
+      tx.instructions.map(async instruction => {
+        return await sw.ownerInvokeInstructionV2({
+          instruction,
+          index: subaccountInfo.account.index.toNumber()
+        });
+      })
+    );
+    const newTX = TransactionEnvelope.combineAll(...allTXs);
+    newTX.addSigners(...tx.signers);
+    return newTX;
+  };
+
+  const ownerInvokeTX = async (
+    ...[tx, ...rest]: Parameters<typeof signAndConfirmTX>
+  ) => {
+    return await signAndConfirmTX(await buildOwnerInvokeTX(tx), ...rest);
+  };
+
+  return {
+    ecWallet,
+    isMemberOfEC,
+    ownerInvokerKey,
+    buildOwnerInvokeTX,
+    ownerInvokeTX
+  };
+};
diff --git a/hooks/tribeca/useGovernor.ts b/hooks/tribeca/useGovernor.ts
new file mode 100644
index 00000000..f856d81e
--- /dev/null
+++ b/hooks/tribeca/useGovernor.ts
@@ -0,0 +1,180 @@
+import { useAccountData, usePubkey, useToken } from '@saberhq/sail';
+import { Token, TokenAmount } from '@saberhq/token-utils';
+import type { PublicKey } from '@solana/web3.js';
+import { GovernorWrapper } from '@tribecahq/tribeca-sdk';
+import { useMemo } from 'react';
+import { createContainer } from 'unstated-next';
+
+import { useSDK } from 'helpers/sdk';
+import { formatDurationSeconds } from 'helpers/format';
+import { useGovernorData, useLockerData } from 'helpers/parser';
+
+// export interface GaugeSettings {
+//   gaugemeister: PublicKey;
+// }
+
+// export type GovernorInfo = (
+//   | {
+//       key: PublicKey;
+//       meta: GovernorConfig | null;
+//       slug: string;
+//       loading: boolean;
+//     }
+//   | {
+//       key: PublicKey | null;
+//       meta: GovernorConfig | null;
+//       slug: string;
+//       loading: true;
+//     }
+// ) & {
+//   gauge: GaugeSettings | null;
+//   manifest: GovernorConfig | null | undefined;
+// };
+
+// export const useGovernorInfo = (): GovernorInfo | null => {
+//   const { governor: governorStr } = useParams<{ governor: string }>();
+//   const { data: governorMetas, isLoading, isFetched } = useTribecaRegistry();
+
+//   const governorMeta = useMemo(
+//     () =>
+//       governorMetas?.find(
+//         gov =>
+//           gov.address.toString() === governorStr || gov.slug === governorStr
+//       ) ?? null,
+//     [governorMetas, governorStr]
+//   );
+//   const slug = governorMeta?.slug ?? governorStr;
+
+//   const {
+//     data: manifest,
+//     isLoading: mfIsLoading,
+//     isFetched: mfIsFetched
+//   } = useGovernanceManifest(slug);
+
+//   const key = usePubkey(governorMeta?.address ?? governorStr);
+//   const gaugemeister = usePubkey(governorMeta?.gauge?.gaugemeister);
+
+//   const loading = isLoading || !isFetched || mfIsLoading || !mfIsFetched;
+//   if (loading && !key) {
+//     return {
+//       key: null,
+//       meta: governorMeta,
+//       manifest,
+//       slug,
+//       loading: true,
+//       gauge: null
+//     };
+//   }
+
+//   // If there is no key and we aren't loading, the governor doesn't exist.
+//   if (!key) {
+//     return null;
+//   }
+
+//   return {
+//     key,
+//     meta: governorMeta,
+//     slug,
+//     manifest,
+//     loading,
+//     gauge: gaugemeister ? { gaugemeister } : null
+//   };
+// };
+
+interface GovernorProps {
+  governor: PublicKey | undefined;
+  govToken: PublicKey | undefined;
+}
+
+const useGovernorInner = (props: GovernorProps | undefined) => {
+  if (!props || !props.governor) {
+    throw new Error('Governor not loaded.');
+  }
+  const { governor } = props!;
+  const { data: govDataRaw } = useAccountData(governor);
+  const { data: parsedGovernorData } = useGovernorData(governor);
+
+  const governorData =
+    govDataRaw === undefined ? undefined : parsedGovernorData;
+  const { data: lockerData } = useLockerData(
+    governorData ? governorData.account.electorate : governorData
+  );
+  console.log(lockerData);
+  const { data: backupGovToken } = useToken(
+    lockerData ? lockerData.account.tokenMint : lockerData
+  );
+
+  const govToken = props.govToken
+    ? new Token({
+        address: props.govToken.toBase58(),
+        symbol: 'HONEY',
+        name: 'HONEY',
+        chainId: 1,
+        decimals: 6
+      })
+    : backupGovToken;
+  const veToken = govToken
+    ? new Token({
+        ...govToken.info,
+        name: `Voting Escrow ${govToken.name}`,
+        symbol: `ve${govToken.symbol}`
+      })
+    : govToken;
+
+  const minActivationThreshold =
+    veToken && lockerData
+      ? new TokenAmount(
+          veToken,
+          lockerData.account.params.proposalActivationMinVotes
+        )
+      : null;
+
+  const lockedSupply =
+    govToken && lockerData
+      ? new TokenAmount(govToken, lockerData.account.lockedSupply)
+      : govToken === undefined && lockerData === undefined
+      ? undefined
+      : null;
+
+  const proposalCount = governorData
+    ? governorData.account.proposalCount.toNumber()
+    : governorData;
+
+  const { tribecaMut } = useSDK();
+  const governorW = useMemo(
+    () => (tribecaMut ? new GovernorWrapper(tribecaMut, governor!) : null),
+    [governor, tribecaMut]
+  );
+
+  const smartWallet = governorData
+    ? governorData.account.smartWallet
+    : governorData;
+
+  return {
+    governor,
+    governorW,
+    governorData,
+    lockerData,
+    govToken,
+    veToken,
+    minActivationThreshold,
+    lockedSupply,
+    proposalCount,
+    smartWallet
+  };
+};
+
+export const useGovernorParams = () => {
+  const { governorData, veToken } = useGovernor();
+  const votesForQuorum =
+    governorData && veToken
+      ? new TokenAmount(veToken, governorData.account.params.quorumVotes)
+      : null;
+  const votingPeriodFmt = governorData
+    ? formatDurationSeconds(governorData.account.params.votingPeriod.toNumber())
+    : null;
+  return { votesForQuorum, votingPeriodFmt };
+};
+
+export const { useContainer: useGovernor, Provider: GovernorProvider } =
+  createContainer(useGovernorInner);
diff --git a/hooks/tribeca/useProposalVotes.ts b/hooks/tribeca/useProposalVotes.ts
new file mode 100644
index 00000000..80df7dbf
--- /dev/null
+++ b/hooks/tribeca/useProposalVotes.ts
@@ -0,0 +1,3 @@
+export const useProposalVotes = () => {
+  return null;
+};
diff --git a/hooks/tribeca/useProposals.ts b/hooks/tribeca/useProposals.ts
new file mode 100644
index 00000000..77cc5de2
--- /dev/null
+++ b/hooks/tribeca/useProposals.ts
@@ -0,0 +1,265 @@
+import type { ParsedAccountInfo } from '@saberhq/sail';
+import { getCacheKeyOfPublicKey } from '@saberhq/sail';
+import { u64 } from '@saberhq/token-utils';
+import { useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import type { ProposalData, ProposalMetaData } from '@tribecahq/tribeca-sdk';
+import {
+  findProposalAddress,
+  findProposalMetaAddress,
+  getProposalState,
+  ProposalState
+} from '@tribecahq/tribeca-sdk';
+import BN from 'bn.js';
+import { useEffect, useMemo } from 'react';
+import { useQueries, useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import {
+  useParsedProposal,
+  useParsedProposalMeta,
+  useParsedProposalMetas,
+  useParsedProposals,
+  useParsedTXByKey,
+  useParsedTXByKeys
+} from 'helpers/parser';
+import { useGovernor } from './useGovernor';
+
+export const ZERO = new BN(0);
+
+export class ProposalStatus {
+  readonly state: ProposalState;
+  readonly executionTime: BN;
+
+  constructor(proposalState: ProposalState, executedAt: BN | undefined) {
+    this.state = proposalState;
+    this.executionTime = new BN(executedAt ?? '0');
+  }
+
+  get executed() {
+    return this.state === ProposalState.Queued && this.executionTime.gt(ZERO);
+  }
+}
+
+export interface ProposalInfo {
+  proposalKey: PublicKey;
+  index: number;
+  proposalData: ProposalData;
+  proposalMetaData: ProposalMetaData | null;
+  status: ProposalStatus;
+}
+
+const buildProposalInfo = ({
+  index,
+  proposalData,
+  proposalMetaData,
+  executedAt
+}: {
+  index: number;
+  proposalData: ParsedAccountInfo<ProposalData>;
+  proposalMetaData: ProposalMetaData | null;
+  executedAt: BN | undefined;
+}): ProposalInfo => {
+  const state = getProposalState({
+    proposalData: proposalData.accountInfo.data
+  });
+
+  return {
+    proposalKey: proposalData.accountId,
+    index,
+    proposalData: proposalData.accountInfo.data,
+    proposalMetaData: proposalMetaData,
+    status: new ProposalStatus(state, executedAt)
+  };
+};
+
+/**
+ * Fetches the data associated with a specific proposal.
+ */
+export const useProposal = (index: number) => {
+  const { network } = useSolana();
+  const { governor } = useGovernor();
+  const id = `000${index}`.slice(-4);
+
+  const proposalKeys = useQuery(
+    ['proposalKeys', network, governor.toString(), index],
+    async () => {
+      const [proposalKey] = await findProposalAddress(governor, new u64(index));
+      const [proposalMetaKey] = await findProposalMetaAddress(proposalKey);
+      return { proposalKey, proposalMetaKey };
+    }
+  );
+
+  const { data: proposalData } = useParsedProposal(
+    proposalKeys.data?.proposalKey
+  );
+  const { data: proposalMetaData } = useParsedProposalMeta(
+    proposalKeys.data?.proposalMetaKey
+  );
+
+  const queued = proposalData?.accountInfo.data.queuedAt.gt(ZERO);
+  const { data: txData } = useParsedTXByKey(
+    queued ? proposalData?.accountInfo.data.queuedTransaction : null
+  );
+
+  const isLoading =
+    (queued && !txData) || !proposalData || proposalMetaData === undefined;
+  const proposalInfoQuery = useQuery({
+    queryKey: ['proposalInfo', network, governor.toString(), index],
+    queryFn: (): ProposalInfo => {
+      invariant(proposalData);
+      return buildProposalInfo({
+        index: proposalData.accountInfo.data.index.toNumber(),
+        proposalData,
+        proposalMetaData: proposalMetaData
+          ? proposalMetaData.accountInfo.data
+          : null,
+        executedAt: txData?.accountInfo.data.executedAt
+      });
+    },
+    enabled: !isLoading
+  });
+
+  const { refetch } = proposalInfoQuery;
+  const executedAt = txData?.accountInfo.data.executedAt;
+  const info = isLoading ? null : proposalInfoQuery.data ?? null;
+  const state = proposalData
+    ? getProposalState({
+        proposalData: proposalData.accountInfo.data
+      })
+    : null;
+
+  useEffect(() => {
+    if (!isLoading || executedAt?.isZero()) {
+      void refetch();
+    }
+  }, [proposalData, refetch, proposalMetaData, state, isLoading, executedAt]);
+
+  useEffect(() => {
+    if (!proposalData) {
+      return;
+    }
+    if (state === ProposalState.Active) {
+      const timeRemaining =
+        proposalData.accountInfo.data.votingEndsAt.toNumber() * 1_000 -
+        Date.now();
+      return clearTimeout(
+        setTimeout(() => {
+          void refetch();
+        }, timeRemaining + 1)
+      );
+    }
+  }, [proposalData, refetch, state]);
+
+  return {
+    refetch,
+    info,
+    id,
+    index
+  };
+};
+
+/**
+ * Fetches the data associated with all proposals of the DAO.
+ *
+ * This includes both active and draft proposals. In the future, we may want to filter this
+ * out-- we should build an index somewhere for this.
+ *
+ * @returns
+ */
+export const useProposals = () => {
+  const { network } = useSolana();
+  const { governor, governorData, proposalCount } = useGovernor();
+  const proposalsKeys = useQueries(
+    proposalCount
+      ? Array(proposalCount)
+          .fill(null)
+          .map((_, i) => proposalCount - i - 1)
+          .map(i => ({
+            queryKey: ['proposalKeys', network, governor.toString(), i],
+            queryFn: async () => {
+              invariant(governorData);
+              const [proposalKey] = await findProposalAddress(
+                governorData.publicKey,
+                new u64(i)
+              );
+              const [proposalMetaKey] = await findProposalMetaAddress(
+                proposalKey
+              );
+              return { proposalKey, proposalMetaKey };
+            },
+            enabled: !!governorData
+          }))
+      : []
+  );
+
+  const proposalsKeysCache = proposalsKeys
+    .map(p => (p.data ? getCacheKeyOfPublicKey(p.data.proposalKey) : ''))
+    .join(',');
+  const proposalsData = useParsedProposals(
+    useMemo(
+      () => proposalsKeys.map(p => p.data?.proposalKey),
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      [proposalsKeysCache]
+    )
+  );
+  const proposalsMetaData = useParsedProposalMetas(
+    useMemo(
+      () => proposalsKeys.map(p => p.data?.proposalMetaKey),
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      [proposalsKeysCache]
+    )
+  );
+  const transactionsData = useParsedTXByKeys(
+    useMemo(
+      () =>
+        proposalsData
+          .filter(p => p?.accountInfo.data.queuedAt.gt(ZERO))
+          .map(p => p?.accountInfo.data.queuedTransaction),
+      [proposalsData]
+    )
+  );
+
+  const isLoading =
+    !proposalsData.every(p => p !== undefined) ||
+    !proposalsMetaData.every(p => p !== undefined) ||
+    !transactionsData.every(t => t !== undefined);
+
+  return useQueries(
+    proposalCount
+      ? Array(proposalCount)
+          .fill(null)
+          .map((_, i) => proposalCount - i - 1)
+          .map(i => ({
+            queryKey: ['proposalInfo', network, governor.toString(), i],
+            queryFn: (): ProposalInfo | null => {
+              const proposalData = proposalsData.find(
+                p => p?.accountInfo.data.index.toNumber() === i
+              );
+              if (!proposalData) {
+                return null;
+              }
+              const proposalMetaData = proposalsMetaData.find(p =>
+                p?.accountInfo.data.proposal.equals(proposalData.accountId)
+              );
+              const transactionData = transactionsData.find(t =>
+                t
+                  ? proposalData.accountInfo.data.queuedTransaction.equals(
+                      t.accountId
+                    )
+                  : false
+              );
+              return buildProposalInfo({
+                index: proposalData.accountInfo.data.index.toNumber(),
+                proposalData,
+                proposalMetaData: proposalMetaData
+                  ? proposalMetaData.accountInfo.data
+                  : null,
+                executedAt: transactionData?.accountInfo.data.executedAt
+              });
+            },
+            enabled: !isLoading
+          }))
+      : []
+  );
+};
diff --git a/hooks/tribeca/useVote.ts b/hooks/tribeca/useVote.ts
new file mode 100644
index 00000000..62b22641
--- /dev/null
+++ b/hooks/tribeca/useVote.ts
@@ -0,0 +1,23 @@
+import { useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import { findVoteAddress } from '@tribecahq/tribeca-sdk';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import { useParsedVote } from 'helpers/parser';
+
+export const useVote = (proposalKey?: PublicKey, voter?: PublicKey) => {
+  const { network } = useSolana();
+  const voteKey = useQuery(
+    ['voteKey', network, proposalKey?.toString(), voter?.toString()],
+    async () => {
+      invariant(proposalKey && voter);
+      const [escrowKey] = await findVoteAddress(proposalKey, voter);
+      return escrowKey;
+    },
+    {
+      enabled: !!(proposalKey && voter)
+    }
+  );
+  return useParsedVote(voteKey.data);
+};
diff --git a/hooks/useIDLs.ts b/hooks/useIDLs.ts
new file mode 100644
index 00000000..f0405d2b
--- /dev/null
+++ b/hooks/useIDLs.ts
@@ -0,0 +1,34 @@
+import { useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import { useQueries } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import { fetchIDL } from 'helpers/fetchers';
+import { KNOWN_NON_ANCHOR_PROGRAMS } from 'helpers/utils';
+
+export const useIDLs = (idls: (PublicKey | null | undefined)[]) => {
+  const { connection } = useSolana();
+  return useQueries(
+    idls.map(pid => ({
+      queryKey: ['idl', pid?.toString()],
+      queryFn: async () => {
+        invariant(pid);
+        if (KNOWN_NON_ANCHOR_PROGRAMS.has(pid.toString())) {
+          return { programID: pid, idl: null };
+        }
+        return {
+          programID: pid,
+          idl: await fetchIDL(connection, pid.toString())
+        };
+      },
+      enabled: !!pid,
+      staleTime: Infinity
+    }))
+  );
+};
+
+export const useIDL = (address: PublicKey | null | undefined) => {
+  const ret = useIDLs([address])[0];
+  invariant(ret);
+  return ret;
+};
diff --git a/hooks/useParsedInstruction.ts b/hooks/useParsedInstruction.ts
new file mode 100644
index 00000000..447b957a
--- /dev/null
+++ b/hooks/useParsedInstruction.ts
@@ -0,0 +1,195 @@
+import { BorshCoder } from '@project-serum/anchor';
+import type { InstructionDisplay } from '@project-serum/anchor/dist/cjs/coder/borsh/instruction';
+import type {
+  IdlAccount,
+  IdlAccountItem
+} from '@project-serum/anchor/dist/cjs/idl';
+import type { PublicKey, TransactionInstruction } from '@solana/web3.js';
+import type { ProposalInstruction } from '@tribecahq/tribeca-sdk';
+import { startCase } from 'lodash';
+import { useMemo } from 'react';
+
+import { parseNonAnchorInstruction } from 'helpers/instructions/parseNonAnchorInstruction';
+import { useIDL } from './useIDLs';
+import { useProgramLabel } from './useProgramMeta';
+
+const flattenIdlAccounts = (
+  accounts: IdlAccountItem[],
+  prefix?: string
+): IdlAccount[] => {
+  return accounts
+    .map(account => {
+      const accName = startCase(account.name);
+      if ('accounts' in account) {
+        const newPrefix = prefix ? `${prefix} > ${accName}` : accName;
+        return flattenIdlAccounts(account.accounts, newPrefix);
+      } else {
+        return {
+          ...account,
+          name: prefix ? `${prefix} > ${accName}` : accName
+        };
+      }
+    })
+    .flat();
+};
+
+export type InstructionData =
+  | {
+      type: 'raw';
+      data: Uint8Array;
+    }
+  | {
+      type: 'anchor';
+      args: { name: string; type: string; data: string }[];
+    }
+  | {
+      type: 'object';
+      args: unknown;
+    };
+
+export type InstructionAccount = {
+  name?: string;
+  pubkey: PublicKey;
+  isSigner: boolean;
+  isWritable: boolean;
+};
+
+export interface ParsedInstruction {
+  name: string;
+  data: InstructionData;
+  accounts: InstructionAccount[];
+}
+
+export interface RichParsedInstruction extends ParsedInstruction {
+  title: string;
+  programID: PublicKey;
+}
+
+export const useParsedProposalInstruction = (
+  ix: ProposalInstruction
+): RichParsedInstruction => {
+  return useParsedInstruction(
+    useMemo(() => ({ ...ix, data: Buffer.from(ix.data) }), [ix])
+  );
+};
+
+export const useParsedInstruction = (
+  ix: TransactionInstruction
+): RichParsedInstruction => {
+  const { data: idl } = useIDL(ix.programId);
+  const label = useProgramLabel(ix.programId);
+
+  const anchorIX = useMemo((): ParsedInstruction | null => {
+    if (!idl?.idl) {
+      return null;
+    }
+    const coder = new BorshCoder(idl.idl);
+    const decoded = coder.instruction.decode(Buffer.from(ix.data));
+    if (!decoded) {
+      return null;
+    }
+
+    const idlIx = idl.idl.instructions.find(i => decoded.name === i.name);
+    if (idlIx) {
+      const flatIdlAccounts = flattenIdlAccounts(idlIx.accounts);
+      const accounts = ix.keys.map((meta, idx) => {
+        if (idx < flatIdlAccounts.length) {
+          return {
+            name: flatIdlAccounts[idx]?.name ?? `Account #${idx + 1}`,
+            ...meta
+          };
+        }
+        // "Remaining accounts" are unnamed in Anchor.
+        else {
+          return {
+            name: `Account #${idx + 1}`,
+            ...meta
+          };
+        }
+      });
+      return {
+        name: decoded.name,
+        data: { type: 'object', args: decoded.data },
+        accounts
+      };
+    }
+    let parsed: InstructionDisplay | null = null;
+    try {
+      parsed = coder.instruction.format(decoded, ix.keys);
+    } catch (e) {
+      console.warn(`Error formatting instruction`, e);
+    }
+    if (parsed) {
+      return {
+        name: decoded.name,
+        data: { type: 'anchor', args: parsed.args },
+        accounts: parsed.accounts
+      };
+    }
+    if (idl.idl.state) {
+      const methodSoap = idl.idl.state.methods.find(
+        m => m.name === decoded.name
+      );
+      const parsed = new BorshCoder({
+        ...idl.idl,
+        instructions: methodSoap
+          ? [
+              {
+                ...methodSoap,
+                accounts: [
+                  {
+                    name: `Program State`,
+                    isMut: true,
+                    isSigner: false
+                  },
+                  ...methodSoap.accounts
+                ]
+              }
+            ]
+          : []
+      }).instruction.format(decoded, ix.keys);
+      if (!parsed) {
+        return null;
+      }
+      return {
+        name: decoded.name,
+        data: { type: 'anchor', args: parsed.args },
+        accounts: parsed.accounts
+      };
+    }
+    return null;
+  }, [idl?.idl, ix]);
+
+  const decodedIX = useMemo((): ParsedInstruction | null => {
+    if (anchorIX) {
+      return anchorIX;
+    }
+    const parsedNonAnchor = parseNonAnchorInstruction(ix);
+    if (!parsedNonAnchor || 'error' in parsedNonAnchor) {
+      return null;
+    }
+    const { name, accountLabels, program: _program, ...args } = parsedNonAnchor;
+    return {
+      name,
+      data: { type: 'object', args },
+      accounts: ix.keys.map((accountMeta, i): InstructionAccount => {
+        const label = accountLabels?.[i];
+        return {
+          ...accountMeta,
+          name: label ?? `Account #${i + 1}`
+        };
+      })
+    };
+  }, [anchorIX, ix]);
+
+  const name = decodedIX ? startCase(decodedIX.name) : 'Unknown Instruction';
+  const title = `${label}: ${name}`;
+
+  return {
+    title,
+    name,
+    data: decodedIX?.data ?? { type: 'raw', data: ix.data },
+    accounts: decodedIX?.accounts ?? ix.keys,
+    programID: ix.programId
+  };
+};
diff --git a/hooks/useProgramMeta.ts b/hooks/useProgramMeta.ts
new file mode 100644
index 00000000..640410ac
--- /dev/null
+++ b/hooks/useProgramMeta.ts
@@ -0,0 +1,40 @@
+import type { PublicKey } from '@solana/web3.js';
+
+import { displayAddress, programLabel } from 'helpers/utils';
+import type { ProgramDetails } from './deploydao/types';
+import { useProgramMeta } from './deploydao/useProgramMeta';
+
+const makeURL = (programID: string) =>
+  `https://raw.githubusercontent.com/DeployDAO/solana-program-index/master/programs/${programID}.json`;
+
+export interface ProgramMeta {
+  label: string;
+}
+
+export const fetchProgramMeta = async (
+  address: string
+): Promise<ProgramDetails | null> => {
+  const response = await fetch(makeURL(address));
+  if (response.status === 404) {
+    return null;
+  }
+  if (!response.ok) {
+    throw new Error('Network response was not ok');
+  }
+  return (await response.json()) as ProgramDetails;
+};
+
+export const useProgramLabel = (programId: PublicKey | null | undefined) => {
+  const { data: meta, isLoading } = useProgramMeta(programId?.toString());
+  const label =
+    meta?.program.label ??
+    (isLoading
+      ? programId
+        ? displayAddress(programId.toString())
+        : 'Loading...'
+      : programId
+      ? programLabel(programId.toString()) ??
+        `Unknown (${programId.toString()}) Program`
+      : 'Unknown Program');
+  return label;
+};
diff --git a/hooks/useSmartWalletAddress.tsx b/hooks/useSmartWalletAddress.tsx
new file mode 100644
index 00000000..6716585a
--- /dev/null
+++ b/hooks/useSmartWalletAddress.tsx
@@ -0,0 +1,35 @@
+import { findOwnerInvokerAddress, findSmartWallet } from '@gokiprotocol/client';
+import type { PublicKey } from '@solana/web3.js';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+export const useSmartWalletAddress = (base: PublicKey | null | undefined) => {
+  return useQuery(
+    ['walletKey', base?.toString()],
+    async () => {
+      invariant(base);
+      const [address] = await findSmartWallet(base);
+      return address;
+    },
+    {
+      enabled: !!base
+    }
+  );
+};
+
+export const useOwnerInvokerAddress = (
+  smartWallet: PublicKey | null | undefined,
+  index = 0
+) => {
+  return useQuery(
+    ['ownerInvoker', smartWallet?.toString()],
+    async () => {
+      invariant(smartWallet);
+      const [address] = await findOwnerInvokerAddress(smartWallet, index);
+      return address;
+    },
+    {
+      enabled: !!smartWallet
+    }
+  );
+};
diff --git a/icons/PulsingDot.tsx b/icons/PulsingDot.tsx
new file mode 100644
index 00000000..fd46feaf
--- /dev/null
+++ b/icons/PulsingDot.tsx
@@ -0,0 +1,35 @@
+export const PulsingDot = (props: { color: string }) => (
+  <svg
+    width="200"
+    height="200"
+    viewBox="0 0 40 40"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <circle
+      cx="20"
+      cy="20"
+      fill="none"
+      r="10"
+      stroke="currentcolor"
+      strokeWidth="2"
+    >
+      <animate
+        attributeName="r"
+        from="8"
+        to="20"
+        dur="1.5s"
+        begin="0s"
+        repeatCount="indefinite"
+      />
+      <animate
+        attributeName="opacity"
+        from="1"
+        to="0"
+        dur="1.5s"
+        begin="0s"
+        repeatCount="indefinite"
+      />
+    </circle>
+    <circle cx="20" cy="20" fill="currentcolor" r="10" />
+  </svg>
+);
diff --git a/package.json b/package.json
index bb8acb5c..dc441ae6 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "@fontsource/ia-writer-mono": "^4.5.1",
     "@fontsource/inter": "^4.5.4",
     "@gemworks/gem-farm-ts": "^0.24.1",
+    "@gokiprotocol/client": "^0.10.4",
     "@gokiprotocol/walletkit": "^1.6.5",
     "@metaplex-foundation/mpl-auction": "^0.0.2",
     "@metaplex-foundation/mpl-core": "^0.0.4",
@@ -25,27 +26,35 @@
     "@nfteyez/sol-rayz": "^0.10.2",
     "@nfteyez/sol-rayz-react": "^0.10.2",
     "@project-serum/anchor": "^0.24.2",
-    "@saberhq/solana-contrib": "^1.12.48",
+    "@saberhq/anchor-contrib": "^1.13.1",
+    "@saberhq/sail": "3.4.4",
+    "@saberhq/snapshots": "^0.2.8",
+    "@saberhq/solana-contrib": "^1.13.1",
     "@saberhq/token-utils": "^1.12.48",
     "@saberhq/use-solana": "^1.12.48",
     "@solana/spl-token": "0.1.8",
     "@solana/web3.js": "^1.36.0",
     "@strata-foundation/spl-utils": "^3.5.7",
+    "@tribecahq/tribeca-sdk": "^0.5.6",
     "@vanilla-extract/babel-plugin": "^1.1.4",
     "@vanilla-extract/css": "^1.6.8",
     "@vanilla-extract/next-plugin": "^2.0.1",
     "@vanilla-extract/sprinkles": "^1.4.0",
     "bn.js": "^5.2.0",
+    "date-fns": "^2.28.0",
     "degen": "^0.0.69",
     "jsbi": "^4.1.0",
     "next": "12.1.0",
     "react": "17.0.2",
     "react-countdown": "^2.3.2",
     "react-dom": "17.0.2",
+    "react-markdown": "^8.0.3",
     "react-number-format": "^4.9.1",
+    "react-query": "^3.39.0",
     "react-toastify": "^8.2.0",
     "recharts": "^2.1.9",
-    "yarn": "^1.22.18"
+    "yarn": "^1.22.18",
+    "yup": "^0.32.11"
   },
   "devDependencies": {
     "@types/node": "17.0.21",
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 23157c23..4bf4adab 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,17 +1,24 @@
-import type { AppProps } from 'next/app';
-import { ThemeProvider } from 'degen';
-import 'degen/styles';
+import { useEffect, useState } from 'react';
 import { WalletKitProvider } from '@gokiprotocol/walletkit';
-import '../styles/globals.css';
 import { Network } from '@saberhq/solana-contrib';
+import { PartialNetworkConfigMap } from '@saberhq/use-solana/src/utils/useConnectionInternal';
+import { SailProvider } from '@saberhq/sail';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import { ReactQueryDevtools } from 'react-query/devtools';
+import type { AppProps } from 'next/app';
+import { ThemeProvider } from 'degen';
 import { ToastContainer } from 'react-toastify';
-import 'react-toastify/dist/ReactToastify.css';
 import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
-import { PartialNetworkConfigMap } from '@saberhq/use-solana/src/utils/useConnectionInternal';
-import { useEffect, useState } from 'react';
 import SecPopup from 'components/SecPopup';
 import Script from 'next/script';
+import { GOVERNOR_ADDRESS, SDKProvider } from 'helpers/sdk';
+
+import 'degen/styles';
+import '../styles/globals.css';
+import 'react-toastify/dist/ReactToastify.css';
+import { GovernorProvider } from 'hooks/tribeca/useGovernor';
 
+const queryClient = new QueryClient();
 const network = process.env.NETWORK as Network;
 const networkConfiguration = () => {
   if (process.env.NETWORK_CONFIGURATION) {
@@ -59,23 +66,33 @@ function MyApp({ Component, pageProps }: AppProps) {
 
          `}
       </Script>
-      <WalletKitProvider
-        defaultNetwork={network}
-        app={{
-          name: 'Honey Finance'
-        }}
-        networkConfigs={networkConfiguration()}
-      >
-        {/* {children} */}
-        {showPopup ? (
-          <SecPopup setShowPopup={setShowPopup} />
-        ) : (
-          <>
-            <Component {...pageProps} />
-            <ToastContainer theme="dark" position="bottom-right" />
-          </>
-        )}
-      </WalletKitProvider>
+      <QueryClientProvider client={queryClient}>
+        <ReactQueryDevtools initialIsOpen={false} />
+        <WalletKitProvider
+          defaultNetwork={network}
+          app={{
+            name: 'Honey Finance'
+          }}
+          networkConfigs={networkConfiguration()}
+        >
+          <SailProvider>
+            <SDKProvider>
+              <GovernorProvider initialState={{ governor: GOVERNOR_ADDRESS }}>
+              {/* {children} */}
+              {showPopup ? (
+                <SecPopup setShowPopup={setShowPopup} />
+              ) : (
+                <>
+                  <Component {...pageProps} />
+                  <ToastContainer theme="dark" position="bottom-right" />
+                </>
+              )}
+             </GovernorProvider>
+            </SDKProvider>
+          </SailProvider>
+        </WalletKitProvider>
+      </QueryClientProvider>
+
     </ThemeProvider>
   );
 }
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 14b68647..5391c4f7 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -3,9 +3,11 @@ import {
   Box,
   Button,
   Card,
+  Heading,
   IconChevronRight,
   IconExclamation,
   Input,
+  Stat,
   Tag,
   Text
 } from 'degen';
@@ -19,6 +21,7 @@ import HoneyModal from 'components/HoneyModal/HoneyModal';
 import { PublicKey } from '@solana/web3.js';
 import { useConnectedWallet } from '@saberhq/use-solana';
 import { useWalletKit } from '@gokiprotocol/walletkit';
+import NumberFormat from 'react-number-format';
 import { useStake } from 'hooks/useStake';
 import { useAccounts } from 'hooks/useAccounts';
 import {
@@ -50,7 +53,7 @@ const Governance: NextPage = () => {
 
   const STAKE_POOL_ADDRESS = new PublicKey(
     process.env.NEXT_STAKE_POOL_ADDR ||
-      '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
+      'Cv9Hx3VRvqkz5JRPiZM8A2BH31yvpcT4qiUJLdtgu7TE'
   );
   const LOCKER_ADDRESS = new PublicKey(
     process.env.NEXT_LOCKER_ADDR ||
@@ -148,6 +151,45 @@ const Governance: NextPage = () => {
           </Text>
         </Box> */}
         {/* Cards row */}
+        <Box display="flex" width="full">
+          <Card level="2" padding="6" width="full">
+            <Box
+              display="flex"
+              alignItems="center"
+              flexDirection={{ xs: 'column', md: 'row' }}
+              justifyContent="space-between"
+            >
+              <Box
+                display="flex"
+                flexDirection={{ xs: 'column', md: 'row' }}
+                alignItems="center"
+              >
+                <IconExclamation color="accent" />
+                <Text variant="small" align="center">
+                  Pre-IDO HONEY (pHONEY) can be converted to HONEY at a 1:1
+                  ratio.{' '}
+                  <Text as="span" color="accent">
+                    You can increase this ratio by locking your tokens
+                  </Text>{' '}
+                  (and receive veHONEY). To participate in governance, you can
+                  lock your HONEY for veHONEY.
+                </Text>
+              </Box>
+              <Stack direction="horizontal" justify="center" align="center">
+                <Button
+                  as="a"
+                  href="https://docs.honey.finance/tokenomics/vehoney"
+                  target="_blank"
+                  size="small"
+                  variant="tertiary"
+                >
+                  Learn more
+                </Button>
+              </Stack>
+            </Box>
+          </Card>
+        </Box>
+
         <Stack
           direction={{
             lg: 'horizontal',
@@ -163,7 +205,8 @@ const Governance: NextPage = () => {
             alignItems="stretch"
             width={{ sm: 'full', md: '1/2' }}
           >
-            <Card level="2" padding="6">
+            //TODO: add maintenance warning??
+            {/* <Card level="2" padding="6">
               <Box display="flex" height="full">
                 <Stack flex={1} justify="center" align="center" space="3">
                   <IconExclamation color="accent" />
@@ -187,7 +230,43 @@ const Governance: NextPage = () => {
                     >
                       Learn more
                     </Button>
-                  </Stack>
+                  </Stack> */}
+            <Card level="2" padding="6" width="full">
+              <Box display="flex" height="full" width="full">
+                <Stack flex={1} justify="space-around">
+                  <Stat
+                    label="Locked"
+                    value={
+                      <NumberFormat
+                        thousandSeparator
+                        value={1000000000}
+                        displayType={'text'}
+                      />
+                    }
+                    size="small"
+                  />
+                  <Stat
+                    label="Total Supply of veHONEY"
+                    value={
+                      <NumberFormat
+                        thousandSeparator
+                        value={1000000000}
+                        displayType={'text'}
+                      />
+                    }
+                    size="small"
+                  />
+                  <Stat
+                    label="Total Supply of HONEY"
+                    value={
+                      <NumberFormat
+                        thousandSeparator
+                        value={1000000000}
+                        displayType={'text'}
+                      />
+                    }
+                    size="small"
+                  />
                 </Stack>
               </Box>
             </Card>
@@ -252,7 +331,7 @@ const Governance: NextPage = () => {
                             <Text size="small">{pHoneyAmount}</Text>
                           </Stack>
                           <Stack justify="space-between" direction="horizontal">
-                            <Text size="small">$HONEY balance</Text>
+                            <Text size="small">HONEY balance</Text>
                             <Text size="small">{honeyAmount}</Text>
                           </Stack>
                         </Stack>
@@ -301,6 +380,15 @@ const Governance: NextPage = () => {
           borderRadius="2xLarge"
           backgroundColor="backgroundTertiary"
         >
+          <Text
+            weight="semiBold"
+            variant="large"
+            ellipsis
+            lineHeight="none"
+            whiteSpace="pre-wrap"
+          >
+            Recent Proposals
+          </Text>
           <Stack>
             {HIPS.map(hip => (
               <Box
diff --git a/pages/governance/proposals/create.tsx b/pages/governance/proposals/create.tsx
new file mode 100644
index 00000000..e2a18afd
--- /dev/null
+++ b/pages/governance/proposals/create.tsx
@@ -0,0 +1,13 @@
+import { NextPage } from 'next';
+import Layout from 'components/Layout/Layout';
+import { ProposalCreateView } from 'components/Proposals/ProposalCreateView/locked-voter';
+
+const ProposalCreate: NextPage = () => {
+  return (
+    <Layout>
+      <ProposalCreateView />
+    </Layout>
+  );
+};
+
+export default ProposalCreate;
diff --git a/pages/governance/proposals/index.tsx b/pages/governance/proposals/index.tsx
new file mode 100644
index 00000000..da5ce804
--- /dev/null
+++ b/pages/governance/proposals/index.tsx
@@ -0,0 +1,16 @@
+import { NextPage } from 'next';
+import { useState } from 'react';
+import { ProposalsList } from 'components/Proposals/ProposalsList';
+import Layout from 'components/Layout/Layout';
+
+const Proposals: NextPage = () => {
+  const [showDrafts, setShowDrafts] = useState(false);
+
+  return (
+    <Layout>
+      <ProposalsList showDrafts={showDrafts} />
+    </Layout>
+  );
+};
+
+export default Proposals;
diff --git a/yarn.lock b/yarn.lock
index 8b357132..8586e396 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -186,7 +186,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.1.2":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.15.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
   integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
@@ -385,6 +385,16 @@
     "@solana/wallet-adapter-base" "^0.8.1"
     "@solana/web3.js" "^1.31.0"
 
+"@gokiprotocol/client@^0.10.4":
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/@gokiprotocol/client/-/client-0.10.4.tgz#3848858b4b5768b9af372d8d882c002fc15b251b"
+  integrity sha512-HY48FqG5rdtqnhbyU0Fsq1MEl5bSo2majgYOR7mJBJckRs1bJ5zD71YJFhFZ+3wKtz2HcaUloRNrqloFt1Gc+g==
+  dependencies:
+    lodash.mapvalues "^4.6.0"
+    superstruct "^0.15.4"
+    tiny-invariant "^1.2.0"
+    tslib "^2.3.1"
+
 "@gokiprotocol/walletkit@^1.6.5":
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/@gokiprotocol/walletkit/-/walletkit-1.6.6.tgz#a5d02887bb1c1f00ac84a52ef22bfae997522153"
@@ -795,7 +805,45 @@
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz#782fa5da44c4f38ae9fd38e9184b54e451936118"
   integrity sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg==
 
-"@saberhq/solana-contrib@^1.12.48", "@saberhq/solana-contrib@^1.12.56":
+"@saberhq/anchor-contrib@^1.13.1":
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/@saberhq/anchor-contrib/-/anchor-contrib-1.13.1.tgz#457385ce4533363b983c1ff97251dff2e94259e1"
+  integrity sha512-ZiZAqiQLTpFU43zQfLyoEkJjt+0LW5ZSm63wqc7xm0hKOw/ronMkNOslqXbNqIp2rRRg8GzOFgid4TAEWqzuOw==
+  dependencies:
+    "@saberhq/solana-contrib" "^1.13.1"
+    eventemitter3 "^4.0.7"
+    lodash.camelcase "^4.3.0"
+    lodash.mapvalues "^4.6.0"
+    tslib "^2.4.0"
+
+"@saberhq/sail@3.4.4":
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/@saberhq/sail/-/sail-3.4.4.tgz#c30ed5318aa142a6bf5c8fc2b511a67cc7a85eaa"
+  integrity sha512-/DP6ree/z64sgNdY1cI0fK55bhwKBQ+6aQEsfHRBZP161t5yhBrN7ApoggUt6TZJd8fEwxC3unPDGK3gJ8AMhQ==
+  dependencies:
+    dataloader "^2.1.0"
+    eventemitter3 "^4.0.7"
+    lodash.chunk "^4.2.0"
+    lodash.mapvalues "^4.6.0"
+    lodash.uniq "^4.5.0"
+    lodash.zip "^4.2.0"
+    retry "^0.13.1"
+    tiny-invariant "^1.2.0"
+    tslib "^2.4.0"
+    unstated-next "^1.1.0"
+    use-debounce "^7.0.1"
+
+"@saberhq/snapshots@^0.2.8":
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/@saberhq/snapshots/-/snapshots-0.2.8.tgz#03ac0748d58434696f0ad2eb0d7da7f97f7d76ed"
+  integrity sha512-IqcKPRD/OpY8SUiuaaixdtA0GUZ0vM42/ofPIKqa30bIfJa3r/e/M9wOM7OC1lGVEpicl84mMIFi/lFUvEZsmA==
+  dependencies:
+    "@solana/buffer-layout" "^4.0.0"
+    superstruct "^0.15.4"
+    tiny-invariant "^1.2.0"
+    tslib "^2.3.1"
+
+"@saberhq/solana-contrib@^1.12.56":
   version "1.12.56"
   resolved "https://registry.yarnpkg.com/@saberhq/solana-contrib/-/solana-contrib-1.12.56.tgz#0472ba6960d9993c37808697d7afff5b63e11b14"
   integrity sha512-b6Szv+XqJE9pFqQ6QfQluRyvQIXAdmLk/KrZ2Ks/XtQVMX2ZxdBf5mGozGNa8NzuzgeOzj/BQ8akbAazfll5dw==
@@ -807,6 +855,19 @@
     tiny-invariant "^1.2.0"
     tslib "^2.3.1"
 
+"@saberhq/solana-contrib@^1.13.1":
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/@saberhq/solana-contrib/-/solana-contrib-1.13.1.tgz#b1b583c13ea80d191736947d27b25ca5dd59fd77"
+  integrity sha512-2hWKZS8bhH1QXVzkf0OoMDdNDc/POCUUbKQEGwZBv+ri/9GUkfihYm6TPgVecmqa6PM1qMtUDGqrC529Pi/4mQ==
+  dependencies:
+    "@solana/buffer-layout" "^4.0.0"
+    "@types/promise-retry" "^1.1.3"
+    "@types/retry" "^0.12.2"
+    promise-retry "^2.0.1"
+    retry "^0.13.1"
+    tiny-invariant "^1.2.0"
+    tslib "^2.4.0"
+
 "@saberhq/token-utils@^1.12.48":
   version "1.12.56"
   resolved "https://registry.yarnpkg.com/@saberhq/token-utils/-/token-utils-1.12.56.tgz#c86e5e14f1525502c51243cd6f5ddbb0ba118316"
@@ -1076,6 +1137,15 @@
     localstorage-memory "^1.0.3"
     superstruct "0.14.2"
     tweetnacl "^1.0.3"
+    
+"@tribecahq/tribeca-sdk@^0.5.6":
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/@tribecahq/tribeca-sdk/-/tribeca-sdk-0.5.6.tgz#c0e5cdbb01250de305245bdb3802429c25ec58f8"
+  integrity sha512-ilH5axrUsj2l2yfI2996hJJIvlfUAaaAmLhKLXxVgbByN3qFdrnj3G5qVYxrmECzzU/bkfyNcJt1WyCxpcQ9XQ==
+  dependencies:
+    superstruct "^0.15.4"
+    tiny-invariant "^1.2.0"
+    tslib "^2.3.1"
 
 "@types/bn.js@^4.11.5":
   version "4.11.6"
@@ -1141,6 +1211,13 @@
   resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-2.1.1.tgz#743fdc821c81f86537cbfece07093ac39b4bc342"
   integrity sha512-9MVYlmIgmRR31C5b4FVSWtuMmBHh2mOWQYfl7XAYOa8dsnb7iEmUmRSWSFgXFtkjxO65d7hTUHQC+RhR/9IWFg==
 
+"@types/debug@^4.0.0":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
+  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+  dependencies:
+    "@types/ms" "*"
+
 "@types/express-serve-static-core@^4.17.9":
   version "4.17.28"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
@@ -1158,6 +1235,13 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/hast@^2.0.0":
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc"
+  integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==
+  dependencies:
+    "@types/unist" "*"
+
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -1168,11 +1252,33 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.180.tgz#4ab7c9ddfc92ec4a887886483bc14c79fb380670"
   integrity sha512-XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g==
 
+"@types/lodash@^4.14.175":
+  version "4.14.182"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
+  integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
+
+"@types/mdast@^3.0.0":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
+  integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
+  dependencies:
+    "@types/unist" "*"
+
+"@types/mdurl@^1.0.0":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
+  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
+
 "@types/minimatch@*":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
+"@types/ms@*":
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
+  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+
 "@types/node@*":
   version "17.0.23"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
@@ -1215,6 +1321,11 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
   integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
 
+"@types/prop-types@^15.0.0":
+  version "15.7.5"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
+  integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
+
 "@types/qs@*":
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
@@ -1253,11 +1364,21 @@
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
   integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
 
+"@types/retry@^0.12.2":
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a"
+  integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==
+
 "@types/scheduler@*":
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
   integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
+"@types/unist@*", "@types/unist@^2.0.0":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
+  integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
+
 "@types/ws@^7.4.4":
   version "7.4.7"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702"
@@ -1660,6 +1781,11 @@ babel-plugin-macros@^2.6.1:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
+bail@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.2.tgz#d26f5cd8fe5d6f832a31517b9f7c356040ba6d5d"
+  integrity sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -1695,6 +1821,11 @@ batch@0.6.1:
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
+big-integer@^1.6.16:
+  version "1.6.51"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"
+  integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -1839,6 +1970,20 @@ braces@^3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
+broadcast-channel@^3.4.1:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-3.7.0.tgz#2dfa5c7b4289547ac3f6705f9c00af8723889937"
+  integrity sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    detect-node "^2.1.0"
+    js-sha3 "0.8.0"
+    microseconds "0.2.0"
+    nano-time "1.0.0"
+    oblivious-set "1.0.0"
+    rimraf "3.0.2"
+    unload "2.2.0"
+
 brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1974,6 +2119,11 @@ chalk@^4.0.0, chalk@^4.1.1:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+character-entities@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.1.tgz#98724833e1e27990dee0bd0f2b8a859c3476aac7"
+  integrity sha512-OzmutCf2Kmc+6DrFrrPS8/tDh2+DpnrfzdICHWhcVC9eOd0N1PXmQEE1a8iM4IziIAG+8tmTq3K+oo0ubH6RRQ==
+
 chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -2091,6 +2241,11 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
+comma-separated-tokens@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz#d4c25abb679b7751c880be623c1179780fe1dd98"
+  integrity sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==
+
 commander@^2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2339,6 +2494,16 @@ damerau-levenshtein@^1.0.7:
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
+dataloader@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.1.0.tgz#c69c538235e85e7ac6c6c444bae8ecabf5de9df7"
+  integrity sha512-qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ==
+
+date-fns@^2.28.0:
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
+  integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
+
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -2353,7 +2518,7 @@ debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -2370,6 +2535,13 @@ decimal.js-light@^2.4.1, decimal.js-light@^2.5.1:
   resolved "https://registry.yarnpkg.com/decimal.js-light/-/decimal.js-light-2.5.1.tgz#134fd32508f19e208f4fb2f8dac0d2626a867934"
   integrity sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==
 
+decode-named-character-reference@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.1.tgz#57b2bd9112659cacbc449d3577d7dadb8e1f3d1b"
+  integrity sha512-YV/0HQHreRwKb7uBopyIkLG17jG6Sv2qUchk9qSoVJ2f+flwRsPNBO0hAnjt6mTNYUT+vw9Gy2ihXg4sUWPi2w==
+  dependencies:
+    character-entities "^2.0.0"
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -2480,6 +2652,11 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
+dequal@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d"
+  integrity sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug==
+
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
@@ -2490,11 +2667,16 @@ detect-node-es@^1.1.0:
   resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493"
   integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==
 
-detect-node@^2.0.4:
+detect-node@^2.0.4, detect-node@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
+diff@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -3055,6 +3237,11 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
+extend@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -3538,6 +3725,11 @@ hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hast-util-whitespace@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz#4fc1086467cc1ef5ba20673cb6b03cec3a970f1c"
+  integrity sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg==
+
 hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -3685,6 +3877,11 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
+inline-style-parser@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
+  integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
+
 internal-ip@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -3788,6 +3985,11 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-buffer@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
+  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
+
 is-builtin-module@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.1.0.tgz#6fdb24313b1c03b75f8b9711c0feb8c30b903b00"
@@ -3937,6 +4139,11 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
+is-plain-obj@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.0.0.tgz#06c0999fd7574edf5a906ba5644ad0feb3a84d22"
+  integrity sha512-NXRbBtUdBioI73y/HmOhogw/U5msYPC9DAtGkJXeFcFWSFZw0mCUsPxk/snTuJHzNKA8kLBK4rH97RMB1BfCXw==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -4058,7 +4265,7 @@ js-sha256@^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.8.0:
+js-sha3@0.8.0, js-sha3@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"
   integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==
@@ -4172,6 +4379,11 @@ klaw-sync@^6.0.0:
   integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
   dependencies:
     graceful-fs "^4.1.11"
+    
+kleur@^4.0.3:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.4.tgz#8c202987d7e577766d039a8cd461934c01cda04d"
+  integrity sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA==
 
 language-subtag-registry@~0.3.2:
   version "0.3.21"
@@ -4242,11 +4454,26 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
+lodash-es@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
+
 lodash.chunk@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.chunk/-/lodash.chunk-4.2.0.tgz#66e5ce1f76ed27b4303d8c6512e8d1216e8106bc"
   integrity sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=
 
+lodash.mapvalues@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
+  integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=
+
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
@@ -4257,6 +4484,16 @@ lodash.orderby@^4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.6.0.tgz#e697f04ce5d78522f54d9338b32b81a3393e4eb3"
   integrity sha1-5pfwTOXXhSL1TZM4syuBozk+TrM=
 
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
+lodash.zip@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020"
+  integrity sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=
+
 lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -4300,6 +4537,14 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+match-sorter@^6.0.2:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.1.tgz#98cc37fda756093424ddf3cbc62bfe9c75b92bda"
+  integrity sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    remove-accents "0.4.2"
+
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -4309,6 +4554,59 @@ md5.js@^1.3.4:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
+mdast-util-definitions@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.0.tgz#b6d10ef00a3c4cf191e8d9a5fa58d7f4a366f817"
+  integrity sha512-5hcR7FL2EuZ4q6lLMUK5w4lHT2H3vqL9quPvYZ/Ku5iifrirfMHiGdhxdXMUbUkDmz5I+TYMd7nbaxUhbQkfpQ==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.0"
+    unist-util-visit "^3.0.0"
+
+mdast-util-from-markdown@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz#84df2924ccc6c995dec1e2368b2b208ad0a76268"
+  integrity sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.0"
+    decode-named-character-reference "^1.0.0"
+    mdast-util-to-string "^3.1.0"
+    micromark "^3.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-decode-string "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    unist-util-stringify-position "^3.0.0"
+    uvu "^0.5.0"
+
+mdast-util-to-hast@^12.1.0:
+  version "12.1.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.1.1.tgz#89a2bb405eaf3b05eb8bf45157678f35eef5dbca"
+  integrity sha512-qE09zD6ylVP14jV4mjLIhDBOrpFdShHZcEsYvvKGABlr9mGbV7mTlRWdoFxL/EYSTNDiC9GZXy7y8Shgb9Dtzw==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    "@types/mdast" "^3.0.0"
+    "@types/mdurl" "^1.0.0"
+    mdast-util-definitions "^5.0.0"
+    mdurl "^1.0.0"
+    micromark-util-sanitize-uri "^1.0.0"
+    unist-builder "^3.0.0"
+    unist-util-generated "^2.0.0"
+    unist-util-position "^4.0.0"
+    unist-util-visit "^4.0.0"
+
+mdast-util-to-string@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9"
+  integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==
+
+mdurl@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -4337,6 +4635,201 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
+micromark-core-commonmark@^1.0.1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz#edff4c72e5993d93724a3c206970f5a15b0585ad"
+  integrity sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA==
+  dependencies:
+    decode-named-character-reference "^1.0.0"
+    micromark-factory-destination "^1.0.0"
+    micromark-factory-label "^1.0.0"
+    micromark-factory-space "^1.0.0"
+    micromark-factory-title "^1.0.0"
+    micromark-factory-whitespace "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-chunked "^1.0.0"
+    micromark-util-classify-character "^1.0.0"
+    micromark-util-html-tag-name "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-resolve-all "^1.0.0"
+    micromark-util-subtokenize "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.1"
+    uvu "^0.5.0"
+
+micromark-factory-destination@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz#fef1cb59ad4997c496f887b6977aa3034a5a277e"
+  integrity sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-factory-label@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz#6be2551fa8d13542fcbbac478258fb7a20047137"
+  integrity sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+
+micromark-factory-space@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz#cebff49968f2b9616c0fcb239e96685cb9497633"
+  integrity sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-factory-title@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz#7e09287c3748ff1693930f176e1c4a328382494f"
+  integrity sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A==
+  dependencies:
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+
+micromark-factory-whitespace@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz#e991e043ad376c1ba52f4e49858ce0794678621c"
+  integrity sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==
+  dependencies:
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-character@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.1.0.tgz#d97c54d5742a0d9611a68ca0cd4124331f264d86"
+  integrity sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-chunked@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz#5b40d83f3d53b84c4c6bce30ed4257e9a4c79d06"
+  integrity sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-classify-character@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz#cbd7b447cb79ee6997dd274a46fc4eb806460a20"
+  integrity sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-combine-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz#91418e1e74fb893e3628b8d496085639124ff3d5"
+  integrity sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==
+  dependencies:
+    micromark-util-chunked "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-decode-numeric-character-reference@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz#dcc85f13b5bd93ff8d2868c3dba28039d490b946"
+  integrity sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-decode-string@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz#942252ab7a76dec2dbf089cc32505ee2bc3acf02"
+  integrity sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q==
+  dependencies:
+    decode-named-character-reference "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-encode@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz#2c1c22d3800870ad770ece5686ebca5920353383"
+  integrity sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==
+
+micromark-util-html-tag-name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.0.0.tgz#75737e92fef50af0c6212bd309bc5cb8dbd489ed"
+  integrity sha512-NenEKIshW2ZI/ERv9HtFNsrn3llSPZtY337LID/24WeLqMzeZhBEE6BQ0vS2ZBjshm5n40chKtJ3qjAbVV8S0g==
+
+micromark-util-normalize-identifier@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz#4a3539cb8db954bbec5203952bfe8cedadae7828"
+  integrity sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-resolve-all@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz#a7c363f49a0162e931960c44f3127ab58f031d88"
+  integrity sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==
+  dependencies:
+    micromark-util-types "^1.0.0"
+
+micromark-util-sanitize-uri@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz#27dc875397cd15102274c6c6da5585d34d4f12b2"
+  integrity sha512-cCxvBKlmac4rxCGx6ejlIviRaMKZc0fWm5HdCHEeDWRSkn44l6NdYVRyU+0nT1XC72EQJMZV8IPHF+jTr56lAg==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-encode "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-subtokenize@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz#ff6f1af6ac836f8bfdbf9b02f40431760ad89105"
+  integrity sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA==
+  dependencies:
+    micromark-util-chunked "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+
+micromark-util-symbol@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz#b90344db62042ce454f351cf0bebcc0a6da4920e"
+  integrity sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==
+
+micromark-util-types@^1.0.0, micromark-util-types@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.0.2.tgz#f4220fdb319205812f99c40f8c87a9be83eded20"
+  integrity sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==
+
+micromark@^3.0.0:
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.0.10.tgz#1eac156f0399d42736458a14b0ca2d86190b457c"
+  integrity sha512-ryTDy6UUunOXy2HPjelppgJ2sNfcPz1pLlMdA6Rz9jPzhLikWXv/irpWV/I2jd68Uhmny7hHxAlAhk4+vWggpg==
+  dependencies:
+    "@types/debug" "^4.0.0"
+    debug "^4.0.0"
+    decode-named-character-reference "^1.0.0"
+    micromark-core-commonmark "^1.0.1"
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-chunked "^1.0.0"
+    micromark-util-combine-extensions "^1.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-encode "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-resolve-all "^1.0.0"
+    micromark-util-sanitize-uri "^1.0.0"
+    micromark-util-subtokenize "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.1"
+    uvu "^0.5.0"
+
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -4364,6 +4857,11 @@ micromatch@^4.0.2, micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
+microseconds@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/microseconds/-/microseconds-0.2.0.tgz#233b25f50c62a65d861f978a4a4f8ec18797dc39"
+  integrity sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA==
+
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
@@ -4428,6 +4926,11 @@ mkdirp@^0.5.1, mkdirp@^0.5.5:
   dependencies:
     minimist "^1.2.6"
 
+mri@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
+  integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -4461,6 +4964,18 @@ nan@^2.12.1, nan@^2.13.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
+nano-time@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/nano-time/-/nano-time-1.0.0.tgz#b0554f69ad89e22d0907f7a12b0993a5d96137ef"
+  integrity sha1-sFVPaa2J4i0JB/ehKwmTpdlhN+8=
+  dependencies:
+    big-integer "^1.6.16"
+
+nanoclone@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4"
+  integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
+
 nanoid@^3.1.30:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
@@ -4676,6 +5191,11 @@ object.values@^1.1.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
+oblivious-set@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/oblivious-set/-/oblivious-set-1.0.0.tgz#c8316f2c2fb6ff7b11b6158db3234c49f733c566"
+  integrity sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw==
+
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
@@ -5040,7 +5560,7 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@^15.0.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -5049,6 +5569,16 @@ prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+property-expr@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4"
+  integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==
+
+property-information@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.1.1.tgz#5ca85510a3019726cb9afed4197b7b8ac5926a22"
+  integrity sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==
+
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -5169,11 +5699,37 @@ react-is@^16.10.2, react-is@^16.13.1, react-is@^16.7.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
+react-is@^18.0.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67"
+  integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==
+
 react-lifecycles-compat@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
+react-markdown@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.3.tgz#e8aba0d2f5a1b2124d476ee1fff9448a2f57e4b3"
+  integrity sha512-We36SfqaKoVNpN1QqsZwWSv/OZt5J15LNgTLWynwAN5b265hrQrsjMtlRNwUvS+YyR3yDM8HpTNc4pK9H/Gc0A==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    "@types/prop-types" "^15.0.0"
+    "@types/unist" "^2.0.0"
+    comma-separated-tokens "^2.0.0"
+    hast-util-whitespace "^2.0.0"
+    prop-types "^15.0.0"
+    property-information "^6.0.0"
+    react-is "^18.0.0"
+    remark-parse "^10.0.0"
+    remark-rehype "^10.0.0"
+    space-separated-tokens "^2.0.0"
+    style-to-object "^0.3.0"
+    unified "^10.0.0"
+    unist-util-visit "^4.0.0"
+    vfile "^5.0.0"
+
 react-number-format@^4.9.1:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/react-number-format/-/react-number-format-4.9.1.tgz#62b3450b43c911f9227e770a8ea9fa606696e52e"
@@ -5181,6 +5737,15 @@ react-number-format@^4.9.1:
   dependencies:
     prop-types "^15.7.2"
 
+react-query@^3.39.0:
+  version "3.39.0"
+  resolved "https://registry.yarnpkg.com/react-query/-/react-query-3.39.0.tgz#0caca7b0da98e65008bbcd4df0d25618c2100050"
+  integrity sha512-Od0IkSuS79WJOhzWBx/ys0x13+7wFqgnn64vBqqAAnZ9whocVhl/y1padD5uuZ6EIkXbFbInax0qvY7zGM0thA==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    broadcast-channel "^3.4.1"
+    match-sorter "^6.0.2"
+
 react-remove-scroll-bar@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.2.0.tgz#d4d545a7df024f75d67e151499a6ab5ac97c8cdd"
@@ -5373,6 +5938,30 @@ regexpp@^3.2.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
+remark-parse@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-10.0.1.tgz#6f60ae53edbf0cf38ea223fe643db64d112e0775"
+  integrity sha512-1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    mdast-util-from-markdown "^1.0.0"
+    unified "^10.0.0"
+
+remark-rehype@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-10.1.0.tgz#32dc99d2034c27ecaf2e0150d22a6dcccd9a6279"
+  integrity sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    "@types/mdast" "^3.0.0"
+    mdast-util-to-hast "^12.1.0"
+    unified "^10.0.0"
+
+remove-accents@0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.4.2.tgz#0a43d3aaae1e80db919e07ae254b285d9e1c7bb5"
+  integrity sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U=
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -5472,6 +6061,13 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
+rimraf@3.0.2, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -5479,13 +6075,6 @@ rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -5522,6 +6111,13 @@ rxjs@6:
   dependencies:
     tslib "^1.9.0"
 
+sade@^1.7.3:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
+  integrity sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==
+  dependencies:
+    mri "^1.1.0"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -5813,6 +6409,11 @@ source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
+space-separated-tokens@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz#43193cec4fb858a2ce934b7f98b7f2c18107098b"
+  integrity sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw==
+
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -5978,6 +6579,13 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+style-to-object@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
+  integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==
+  dependencies:
+    inline-style-parser "0.1.1"
+
 styled-jsx@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.0.tgz#816b4b92e07b1786c6b7111821750e0ba4d26e77"
@@ -5993,6 +6601,11 @@ superstruct@0.14.2, superstruct@^0.14.2:
   resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.14.2.tgz#0dbcdf3d83676588828f1cf5ed35cda02f59025b"
   integrity sha512-nPewA6m9mR3d6k7WkZ8N8zpTWfenFH3q9pA2PkuiZxINr9DKB2+40wEQf0ixn8VaGuJ78AB6iWOtStI+/4FKZQ==
 
+superstruct@^0.15.4:
+  version "0.15.4"
+  resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.15.4.tgz#e3381dd84ca07e704e19f69eda74eee1a5efb1f9"
+  integrity sha512-eOoMeSbP9ZJChNOm/9RYjE+F36rYR966AAqeG3xhQB02j2sfAUXDp4EQ/7bAOqnlJnuFDB8yvOu50SocvKpUEw==
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -6124,11 +6737,21 @@ toml@^3.0.0:
   resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
   integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
 
+toposort@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
+  integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
+
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
+trough@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz#0f7b511a4fde65a46f18477ab38849b22c554876"
+  integrity sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==
+
 tsconfig-paths@^3.12.0, tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
@@ -6149,6 +6772,11 @@ tslib@^2.0.3, tslib@^2.3.0, tslib@^2.3.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
+tslib@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -6216,6 +6844,19 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
+unified@^10.0.0:
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.2.tgz#b1d64e55dafe1f0b98bb6c719881103ecf6c86df"
+  integrity sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    bail "^2.0.0"
+    extend "^3.0.0"
+    is-buffer "^2.0.0"
+    is-plain-obj "^4.0.0"
+    trough "^2.0.0"
+    vfile "^5.0.0"
+
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -6230,6 +6871,79 @@ universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+  
+unist-builder@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-3.0.0.tgz#728baca4767c0e784e1e64bb44b5a5a753021a04"
+  integrity sha512-GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+
+unist-util-generated@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.0.tgz#86fafb77eb6ce9bfa6b663c3f5ad4f8e56a60113"
+  integrity sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw==
+
+unist-util-is@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.1.1.tgz#e8aece0b102fa9bc097b0fef8f870c496d4a6236"
+  integrity sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ==
+
+unist-util-position@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.3.tgz#5290547b014f6222dff95c48d5c3c13a88fadd07"
+  integrity sha512-p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+
+unist-util-stringify-position@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz#5c6aa07c90b1deffd9153be170dce628a869a447"
+  integrity sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==
+  dependencies:
+    "@types/unist" "^2.0.0"
+
+unist-util-visit-parents@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz#e83559a4ad7e6048a46b1bdb22614f2f3f4724f2"
+  integrity sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+
+unist-util-visit-parents@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.1.0.tgz#44bbc5d25f2411e7dfc5cecff12de43296aa8521"
+  integrity sha512-y+QVLcY5eR/YVpqDsLf/xh9R3Q2Y4HxkZTp7ViLDU6WtJCEcPmRzW1gpdWDCDIqIlhuPDXOgttqPlykrHYDekg==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+
+unist-util-visit@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-3.1.0.tgz#9420d285e1aee938c7d9acbafc8e160186dbaf7b"
+  integrity sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+    unist-util-visit-parents "^4.0.0"
+
+unist-util-visit@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.0.tgz#f41e407a9e94da31594e6b1c9811c51ab0b3d8f5"
+  integrity sha512-n7lyhFKJfVZ9MnKtqbsqkQEk5P1KShj0+//V7mAcoI6bpbUjh3C/OG8HVD+pBihfh6Ovl01m8dkcv9HNqYajmQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+    unist-util-visit-parents "^5.0.0"
+
+unload@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/unload/-/unload-2.2.0.tgz#ccc88fdcad345faa06a92039ec0f80b488880ef7"
+  integrity sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==
+  dependencies:
+    "@babel/runtime" "^7.6.2"
+    detect-node "^2.0.4"
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
@@ -6287,6 +7001,11 @@ use-callback-ref@^1.2.3, use-callback-ref@^1.2.5:
   resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.5.tgz#6115ed242cfbaed5915499c0a9842ca2912f38a5"
   integrity sha512-gN3vgMISAgacF7sqsLPByqoePooY3n2emTH59Ur5d/M8eg4WTWu1xp8i8DHjohftIyEx0S08RiYxbffr4j8Peg==
 
+use-debounce@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/use-debounce/-/use-debounce-7.0.1.tgz#380e6191cc13ad29f8e2149a12b5c37cc2891190"
+  integrity sha512-fOrzIw2wstbAJuv8PC9Vg4XgwyTLEOdq4y/Z3IhVl8DAE4svRcgyEUvrEXu+BMNgMoc3YND6qLT61kkgEKXh7Q==
+
 use-sidecar@^1.0.1, use-sidecar@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.5.tgz#ffff2a17c1df42e348624b699ba6e5c220527f2b"
@@ -6334,6 +7053,16 @@ uuid@^8.3.0, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uvu@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/uvu/-/uvu-0.5.3.tgz#3d83c5bc1230f153451877bfc7f4aea2392219ae"
+  integrity sha512-brFwqA3FXzilmtnIyJ+CxdkInkY/i4ErvP7uV0DnUVxQcQ55reuHphorpF+tZoVHK2MniZ/VJzI7zJQoc9T9Yw==
+  dependencies:
+    dequal "^2.0.0"
+    diff "^5.0.0"
+    kleur "^4.0.3"
+    sade "^1.7.3"
+
 v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -6352,6 +7081,24 @@ vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
+vfile-message@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.2.tgz#a2908f64d9e557315ec9d7ea3a910f658ac05f7d"
+  integrity sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-stringify-position "^3.0.0"
+
+vfile@^5.0.0:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.2.tgz#b499fbc50197ea50ad3749e9b60beb16ca5b7c54"
+  integrity sha512-w0PLIugRY3Crkgw89TeMvHCzqCs/zpreR31hl4D92y6SOE07+bfJe+dK5Q2akwS+i/c801kzjoOr9gMcTe6IAA==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    is-buffer "^2.0.0"
+    unist-util-stringify-position "^3.0.0"
+    vfile-message "^3.0.0"
+
 wbuf@^1.1.0, wbuf@^1.7.3:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
@@ -6560,3 +7307,16 @@ yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+yup@^0.32.11:
+  version "0.32.11"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5"
+  integrity sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==
+  dependencies:
+    "@babel/runtime" "^7.15.4"
+    "@types/lodash" "^4.14.175"
+    lodash "^4.17.21"
+    lodash-es "^4.17.21"
+    nanoclone "^0.2.1"
+    property-expr "^2.0.4"
+    toposort "^2.0.2"

From 4267b2c336f672962b5456bbe6ee66ac1d8bcc47 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Wed, 11 May 2022 18:51:00 -0500
Subject: [PATCH 033/101] Fix parser error

---
 .../instructions/upgradeable_loader/types.ts  |  1 -
 helpers/parser.ts                             |  8 +++----
 helpers/programs/veHoney.ts                   | 10 ++++----
 helpers/sdk/constant.ts                       |  6 ++---
 hooks/tribeca/useExecutiveCouncil.ts          |  1 -
 hooks/tribeca/useGovernor.ts                  |  1 -
 hooks/useStake.tsx                            | 24 ++++++++-----------
 7 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/helpers/instructions/upgradeable_loader/types.ts b/helpers/instructions/upgradeable_loader/types.ts
index 8a40eae7..5d538769 100644
--- a/helpers/instructions/upgradeable_loader/types.ts
+++ b/helpers/instructions/upgradeable_loader/types.ts
@@ -176,7 +176,6 @@ export const UpgradeableLoaderAccount = coerce(
       case 'uninitialized': {
         return {
           type: value.type,
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           info: create(value.info, ProgramUninitializedAccountInfo)
         };
       }
diff --git a/helpers/parser.ts b/helpers/parser.ts
index 8271062d..bc41e88a 100644
--- a/helpers/parser.ts
+++ b/helpers/parser.ts
@@ -16,8 +16,8 @@ export const {
     useData: useParsedProposalMetas,
     useSingleData: useParsedProposalMeta
   },
-  locker: { useData: useParsedLockers, useSingleData: useParsedLocker },
-  escrow: { useData: useParsedEscrows, useSingleData: useParsedEscrow },
+  lockerV2: { useData: useParsedLockers, useSingleData: useParsedLocker },
+  escrowV2: { useData: useParsedEscrows, useSingleData: useParsedEscrow },
   governor: { useData: useParsedGovernors, useSingleData: useParsedGovernor },
   vote: { useData: useParsedVotes, useSingleData: useParsedVote },
   transaction: { useData: useParsedTXByKeys, useSingleData: useParsedTXByKey }
@@ -48,8 +48,8 @@ export const {
 } = makeProgramParserHooks(GOKI_CODERS.SmartWallet);
 
 export const {
-  escrow: { useSingleData: useEscrowData },
-  locker: { useSingleData: useLockerData }
+  escrowV2: { useSingleData: useEscrowData },
+  lockerV2: { useSingleData: useLockerData }
 } = makeProgramParserHooks(HONEY_DAO_CODERS.LockedVoter);
 
 export const {
diff --git a/helpers/programs/veHoney.ts b/helpers/programs/veHoney.ts
index 773c49b5..6a6eaea3 100644
--- a/helpers/programs/veHoney.ts
+++ b/helpers/programs/veHoney.ts
@@ -5,18 +5,18 @@ import type { VeHoney as VoterIDL } from '../types/ve_honey';
 export type LockedVoterTypes = AnchorTypes<
   VoterIDL,
   {
-    locker: LockerData;
-    escrow: EscrowData;
+    lockerV2: LockerV2Data;
+    escrowV2: EscrowV2Data;
     lockerWhitelistEntry: LockerWhitelistEntryData;
   }
 >;
 
 type Accounts = LockedVoterTypes['Accounts'];
-export type LockerData = Accounts['lockerV2'];
-export type EscrowData = Accounts['escrowV2'];
+export type LockerV2Data = Accounts['lockerV2'];
+export type EscrowV2Data = Accounts['escrowV2'];
 export type LockerWhitelistEntryData = Accounts['whitelistEntry'];
 
-export type LockerParams = LockedVoterTypes['Defined']['LockerParamsV2'];
+export type LockerParamsV2 = LockedVoterTypes['Defined']['LockerParamsV2'];
 
 export type LockedVoterError = LockedVoterTypes['Error'];
 export type LockedVoterProgram = LockedVoterTypes['Program'];
diff --git a/helpers/sdk/constant.ts b/helpers/sdk/constant.ts
index 697ecea7..5cc184c4 100644
--- a/helpers/sdk/constant.ts
+++ b/helpers/sdk/constant.ts
@@ -18,7 +18,7 @@ export const PHONEY_MINT = new PublicKey(
 );
 
 export const WHITELIST_ENTRY = new PublicKey(
-  'EAc9qa3DXCgBwSEjRkXGZxPUmvuNTV56zfYzbjihbiYv'
+  'G62oYbYUbchjHMRddcFaDqRQ5CuNV9KE36kfzyYvFuDy'
 );
 
 export const PHONEY_DECIMALS = 6;
@@ -26,7 +26,7 @@ export const PHONEY_DECIMALS = 6;
 // See `Anchor.toml` for all addresses.
 export const HONEY_DAO_ADDRESSES = {
   Govern: new PublicKey('Govz1VyoyLD5BL6CSCxUJLVLsQHRwjfFj1prNsdNg5Jw'),
-  LockedVoter: new PublicKey('5i6s4zbxYGDhY1UGNZwrtBUAp7u2fnJ8ZSXu39eZWjNT')
+  LockedVoter: new PublicKey(process.env.NEXT_PUBLIC_VOTE_PROGRAM_ID!)
 };
 
 /**
@@ -46,5 +46,5 @@ export const PROPOSAL_TITLE_MAX_LEN = 140;
 
 export const GOVERNOR_ADDRESS = new PublicKey(
   process.env.NEXT_PUBLIC_GOVERNOR_ADDRESS ||
-    'H8Vs8jXXXRW2JTcxhXb2bnngxvmHWdbmExVNjrj5YXvr'
+    'CSFk5VQwpQVs5tVXRLi5jtqJVkySAPxBxAQPD4W2mePa'
 );
diff --git a/hooks/tribeca/useExecutiveCouncil.ts b/hooks/tribeca/useExecutiveCouncil.ts
index 5a22a436..79bd833d 100644
--- a/hooks/tribeca/useExecutiveCouncil.ts
+++ b/hooks/tribeca/useExecutiveCouncil.ts
@@ -34,7 +34,6 @@ export const useExecutiveCouncil = () => {
       enabled: !!smartWalletData
     }
   );
-
   const { data: subaccountInfos } =
     useBatchedSubaccountInfos(subaccountInfoKeys);
 
diff --git a/hooks/tribeca/useGovernor.ts b/hooks/tribeca/useGovernor.ts
index f856d81e..b0c91a68 100644
--- a/hooks/tribeca/useGovernor.ts
+++ b/hooks/tribeca/useGovernor.ts
@@ -99,7 +99,6 @@ const useGovernorInner = (props: GovernorProps | undefined) => {
   const { data: lockerData } = useLockerData(
     governorData ? governorData.account.electorate : governorData
   );
-  console.log(lockerData);
   const { data: backupGovToken } = useToken(
     lockerData ? lockerData.account.tokenMint : lockerData
   );
diff --git a/hooks/useStake.tsx b/hooks/useStake.tsx
index 0b99fd22..e933c404 100644
--- a/hooks/useStake.tsx
+++ b/hooks/useStake.tsx
@@ -20,9 +20,12 @@ const checkErrorAndShowToast = (error: any, defaultToastMsg: string) => {
   if (errorMsg.includes('0x1')) {
     toastMsg = 'Insufficient balance';
   } else if (
-    errorMsg.includes('A voting escrow refresh cannot shorten the escrow time remaining.')
+    errorMsg.includes(
+      'A voting escrow refresh cannot shorten the escrow time remaining.'
+    )
   ) {
-    toastMsg = 'Selected vesting period cannot be shorter than the previously selected vesting period.';
+    toastMsg =
+      'Selected vesting period cannot be shorter than the previously selected vesting period.';
   } else {
     toastMsg = error.message;
   }
@@ -188,28 +191,21 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
     },
     [sc, vc, userKey, pHoneyToken]
   );
-  
+
   const lock = useCallback(
-    async(amount: BN, duration: BN, hasEscrow: boolean = true) => {
+    async (amount: BN, duration: BN, hasEscrow: boolean = true) => {
       if (sc && vc && userKey && honeyToken) {
         setIsLoading(true);
         try {
-          await vc.lock(
-            locker,
-            honeyToken.pubkey,
-            amount,
-            duration,
-            hasEscrow
-          );
+          await vc.lock(locker, honeyToken.pubkey, amount, duration, hasEscrow);
           toast.success('HONEY successfully vested');
           setIsLoading(false);
         } catch (e) {
           console.log(e);
-          checkErrorAndShowToast(e, "HONEY failed vesting")
+          checkErrorAndShowToast(e, 'HONEY failed vesting');
           // toast.error(`${e}`);
           setIsLoading(false);
         }
-
       }
     },
     [sc, vc, userKey, honeyToken]
@@ -223,7 +219,7 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
         setIsLoading(false);
       } catch (e) {
         console.log(e);
-        checkErrorAndShowToast(e, "Error unlocking")
+        checkErrorAndShowToast(e, 'Error unlocking');
         setIsLoading(false);
       }
     }

From f811033bf68ba615ee2ab4782d90a5ffe55edbf8 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Fri, 13 May 2022 07:35:46 -0500
Subject: [PATCH 034/101] Update programs

---
 components/HelperCard.tsx                     |  8 +++++
 components/Modal/ModalInner.tsx               | 24 +++++--------
 components/Modal/index.tsx                    | 10 +++---
 .../ProposalConfirmationModal/ProposalIX.tsx  |  7 ++--
 .../ProposalConfirmationModal/index.tsx       | 34 +++++++++++++------
 .../locked-voter/ProposalTXForm.tsx           |  4 ++-
 6 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/components/HelperCard.tsx b/components/HelperCard.tsx
index cb2d1c17..ce39dff7 100644
--- a/components/HelperCard.tsx
+++ b/components/HelperCard.tsx
@@ -24,6 +24,14 @@ export const HelperCard: React.FC<Props> = ({
       paddingY="2"
       borderWidth="1"
       fontSize="small"
+      // backgroundColor="accent"
+      borderRadius="medium"
+      borderColor="green"
+      borderTopWidth="px"
+      borderLeftWidth="px"
+      borderRightWidth="px"
+      borderBottomWidth="px"
+      opacity="50"
       className={className}
     >
       {children}
diff --git a/components/Modal/ModalInner.tsx b/components/Modal/ModalInner.tsx
index 436b7f9b..ab670346 100644
--- a/components/Modal/ModalInner.tsx
+++ b/components/Modal/ModalInner.tsx
@@ -2,7 +2,7 @@ import { Box, Button, IconClose } from 'degen';
 import { useModal } from './context';
 
 interface Props {
-  title: string;
+  title: React.ReactNode;
   children?: React.ReactNode;
   buttonProps?: React.ComponentProps<typeof Button>;
   className?: string;
@@ -19,25 +19,17 @@ export const ModalInner: React.FC<Props> = ({
     <>
       <Box
         position="relative"
-        fontWeight="bold"
         textAlign="center"
-        paddingY="4"
-        // tw="relative border-b dark:border-b-warmGray-800 dark:text-white font-bold text-base text-center py-4"
+        paddingY="5"
+        borderBottomWidth="px"
+        borderColor="groupBackground"
       >
-        <Box
-          paddingX="8"
-          overflow="hidden"
-          whiteSpace="nowrap"
-          // tw="px-8 overflow-ellipsis overflow-hidden whitespace-nowrap"
-        >
+        <Box paddingX="8" overflow="hidden" whiteSpace="nowrap">
           {title}
         </Box>
-        <Box position="absolute" display="flex" right="4" top="0">
-          <Button
-            onClick={() => close()}
-            // tw="absolute right-4 h-full flex items-center top-0 text-warmGray-600 hover:text-warmGray-200 transition-colors"
-          >
-            <IconClose />
+        <Box position="absolute" display="flex" right="4" top="2">
+          <Button variant="transparent" onClick={close}>
+            <IconClose color="accent" />
           </Button>
         </Box>
       </Box>
diff --git a/components/Modal/index.tsx b/components/Modal/index.tsx
index 50f47672..ea5b6016 100644
--- a/components/Modal/index.tsx
+++ b/components/Modal/index.tsx
@@ -1,5 +1,3 @@
-import '@reach/dialog/styles.css';
-
 import { css } from '@emotion/react';
 import styled from '@emotion/styled';
 import { DialogContent, DialogOverlay } from '@reach/dialog';
@@ -7,9 +5,10 @@ import { animated, useSpring, useTransition } from '@react-spring/web';
 import React from 'react';
 import { isMobile } from 'react-device-detect';
 import { useGesture } from 'react-use-gesture';
-
 import { ModalProvider } from './context';
 
+import '@reach/dialog/styles.css';
+
 export interface ModalProps {
   children: React.ReactNode;
   isOpen: boolean;
@@ -84,7 +83,10 @@ export const Modal: React.FC<ModalProps> = ({
   );
 };
 
-const ModalWrapper = styled(animated(DialogContent))``;
+const ModalWrapper = styled(animated(DialogContent))`
+  background: rgb(24, 24, 24);
+  border-radius: 0.5rem;
+`;
 
 // const ModalWrapper = styled(animated(DialogContent))`
 //   ${tw`shadow-2xl w-full max-w-lg p-6 rounded-lg relative`}
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
index da20620e..86f3993e 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
@@ -1,5 +1,5 @@
 import type { TransactionInstruction } from '@solana/web3.js';
-import { Box } from 'degen';
+import { Box, Text } from 'degen';
 
 import { useParsedInstruction } from 'hooks/useParsedInstruction';
 
@@ -16,8 +16,11 @@ export const ProposalIX: React.FC<Props> = ({ ix }: Props) => {
       paddingY="2"
       fontSize="small"
       fontWeight="semiBold"
+      width="fit"
     >
-      {parsedIX.title}
+      <Text as="span" color="orange">
+        {parsedIX.title}
+      </Text>
     </Box>
   );
 };
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
index a676cf65..c68df1f0 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
@@ -69,7 +69,11 @@ export const ProposalConfirmModal: React.FC<Props> = ({
       {...modalProps}
     >
       <ModalInner
-        title={`Proposal: ${proposal.title}`}
+        title={
+          <Text variant="large" ellipsis>
+            Proposal: {proposal.title}
+          </Text>
+        }
         buttonProps={{
           disabled: !tribecaMut,
           variant: 'primary',
@@ -79,9 +83,11 @@ export const ProposalConfirmModal: React.FC<Props> = ({
       >
         <Box display="grid" paddingY="4" gap="4">
           <HelperCard>
-            <Box as="p" marginBottom="1">
-              Tip: The proposal cannot be modified after submission, so please
-              verify all information before submitting.
+            <Box marginBottom="1">
+              <Text as="p">
+                Tip: The proposal cannot be modified after submission, so please
+                verify all information before submitting.
+              </Text>
             </Box>
             <Text as="p">
               Once submitted, anyone with at least{' '}
@@ -90,11 +96,11 @@ export const ProposalConfirmModal: React.FC<Props> = ({
               immediately begin and last for {votingPeriodFmt}.
             </Text>
           </HelperCard>
-          <Text>
-            <div>
+          <Box>
+            <Text>
               <ReactMarkdown>{proposal.description}</ReactMarkdown>
-            </div>
-          </Text>
+            </Text>
+          </Box>
           <Box display="flex" flexDirection="column" gap="1.5">
             {proposal.instructions.map((ix, i) => (
               <ProposalIX key={i} ix={ix} />
@@ -113,8 +119,16 @@ export const ProposalConfirmModal: React.FC<Props> = ({
               target="_blank"
               rel="noreferrer"
             >
-              <span>Preview on Anchor.so</span>
-              <IconLink />
+              <Box
+                display="flex"
+                alignItems="center"
+                gap="2"
+                color={{ base: 'green', hover: 'white' }}
+                fontSize="small"
+              >
+                <span>Preview on Anchor.so</span>
+                <IconLink size="5" />
+              </Box>
             </a>
           )}
         </Box>
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
index 93942d3f..3e828088 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
@@ -80,7 +80,9 @@ export const ProposalTXForm: React.FC<Props> = ({
       {currentAction && (
         <>
           {currentAction.description && (
-            <HelperCard>{currentAction.description}</HelperCard>
+            <HelperCard>
+              <Text>{currentAction.description}</Text>
+            </HelperCard>
           )}
           <currentAction.Renderer
             actor={actor}

From 863b08f85cb0f6d5adc359b1f10dbc134ae23a51 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Fri, 13 May 2022 19:46:05 -0500
Subject: [PATCH 035/101] Add proposal view page

---
 actions/RawTX.tsx                             |   8 +-
 components/Modal/ModalButton.tsx              |  11 +-
 .../ProposalConfirmationModal/index.tsx       |   6 +-
 .../locked-voter/ProposalCreateInner.tsx      |   2 +-
 .../locked-voter/ProposalTXForm.tsx           |   2 +-
 .../Proposals/ProposalIndexView/index.tsx     |   6 +
 .../CastVoteButton/CastVoteModal.tsx          |  81 +++++++
 .../CastVoteButton/VoteResult.tsx             |  99 +++++++++
 .../CastVoteButton/VoteSelectContents.tsx     | 161 ++++++++++++++
 .../locked-voter/CastVoteButton/index.tsx     |  34 +++
 .../EmbedTX/InstructionPreview.tsx            |  63 ++++++
 .../EmbedTX/InstructionsInner.tsx             |  18 ++
 .../locked-voter/EmbedTX/index.tsx            |  27 +++
 .../ProposalBody/GitHubComments.tsx           |  71 ++++++
 .../locked-voter/ProposalBody/index.tsx       |  34 +++
 .../locked-voter/ProposalDetails.tsx          |  60 +++++
 .../locked-voter/ProposalHelmet.tsx           |  52 +++++
 .../locked-voter/ProposalHistory.tsx          | 132 +++++++++++
 .../locked-voter/VotesCard.tsx                |  80 +++++++
 .../locked-voter/actions/ProposalActivate.tsx | 175 +++++++++++++++
 .../locked-voter/actions/ProposalExecute.tsx  | 177 +++++++++++++++
 .../locked-voter/actions/ProposalQueue.tsx    |  60 +++++
 .../locked-voter/actions/ProposalVote.tsx     | 147 ++++++++++++
 .../ProposalIndexView/locked-voter/github.ts  |  41 ++++
 .../ProposalIndexView/locked-voter/index.tsx  | 126 +++++++++++
 .../Proposals/ProposalsList/ProposalCard.tsx  | 104 +++++----
 .../ProposalsList/ProposalStateDate.tsx       |  40 ++--
 .../ProposalsList/ProposalStateLabel.tsx      |  47 ++--
 components/{ => common}/HelperCard.tsx        |   0
 components/common/governance/Card.tsx         | 108 +++++++++
 .../common/governance/GovernancePage.tsx      |  35 +++
 .../common/governance/GovernancePageInner.tsx | 136 ++++++++++++
 components/common/governance/Meter.tsx        |  42 ++++
 components/common/governance/Profile.tsx      |  86 +++++++
 helpers/utils.ts                              |  23 ++
 hooks/tribeca/useEscrow.ts                    |   2 +-
 hooks/useParsedTX.ts                          |  85 +++++++
 hooks/useSmartWallet.ts                       | 209 ++++++++++++++++++
 hooks/useTXAddress.ts                         |  13 ++
 .../proposals/[proposalIndex]/index.tsx       |  13 ++
 pages/governance/proposals/index.tsx          |   2 +-
 41 files changed, 2514 insertions(+), 104 deletions(-)
 create mode 100644 components/Proposals/ProposalIndexView/index.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/ProposalBody/index.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/github.ts
 create mode 100644 components/Proposals/ProposalIndexView/locked-voter/index.tsx
 rename components/{ => common}/HelperCard.tsx (100%)
 create mode 100644 components/common/governance/Card.tsx
 create mode 100644 components/common/governance/GovernancePage.tsx
 create mode 100644 components/common/governance/GovernancePageInner.tsx
 create mode 100644 components/common/governance/Meter.tsx
 create mode 100644 components/common/governance/Profile.tsx
 create mode 100644 hooks/useParsedTX.ts
 create mode 100644 hooks/useSmartWallet.ts
 create mode 100644 hooks/useTXAddress.ts
 create mode 100644 pages/governance/proposals/[proposalIndex]/index.tsx

diff --git a/actions/RawTX.tsx b/actions/RawTX.tsx
index 5d8d5494..f541b14a 100644
--- a/actions/RawTX.tsx
+++ b/actions/RawTX.tsx
@@ -2,7 +2,7 @@ import { extractErrorMessage } from '@saberhq/sail';
 import { Transaction } from '@solana/web3.js';
 import { Box, Text, Textarea } from 'degen';
 
-import { HelperCard } from 'components/HelperCard';
+import { HelperCard } from 'components/common/HelperCard';
 import type { ActionFormProps } from './types';
 
 export const RawTX: React.FC<ActionFormProps> = ({
@@ -13,7 +13,7 @@ export const RawTX: React.FC<ActionFormProps> = ({
   return (
     <>
       <HelperCard variant="warn">
-        <Text size="headingTwo">
+        <Text as="p" size="base" color="yellow">
           Warning: this page is for advanced users only. Invalid transaction
           data may cause this page to freeze. Documentation will be coming soon.
         </Text>
@@ -22,10 +22,10 @@ export const RawTX: React.FC<ActionFormProps> = ({
         <Box
         // tw="prose prose-sm prose-light"
         >
-          <p>
+          <Text as="p">
             This page allows proposing any arbitrary transaction for execution
             by the DAO. The fee payer and recent blockhash will not be used.
-          </p>
+          </Text>
         </Box>
       </HelperCard>
       <Textarea
diff --git a/components/Modal/ModalButton.tsx b/components/Modal/ModalButton.tsx
index 7786ee3f..0e37c13f 100644
--- a/components/Modal/ModalButton.tsx
+++ b/components/Modal/ModalButton.tsx
@@ -1,7 +1,6 @@
-import { useState } from "react";
-
-import { Button } from "../Button";
-import { Modal } from ".";
+import { Button } from 'degen';
+import { useState } from 'react';
+import { Modal } from '.';
 
 type Props = {
   buttonLabel: string;
@@ -16,13 +15,13 @@ export const ModalButton: React.FC<Props> = ({
   buttonProps,
   children,
   className,
-  onDismiss,
+  onDismiss
 }: Props) => {
   const [showModal, setShowModal] = useState<boolean>(false);
   return (
     <>
       <Modal
-        tw="p-0"
+        // tw="p-0"
         isOpen={showModal}
         onDismiss={() => {
           onDismiss?.();
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
index c68df1f0..a26d128c 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
@@ -5,17 +5,17 @@ import type { TransactionInstruction } from '@solana/web3.js';
 import { GovernorWrapper } from '@tribecahq/tribeca-sdk';
 import ReactMarkdown from 'react-markdown';
 import invariant from 'tiny-invariant';
+import { useRouter } from 'next/router';
+import { Box, IconLink, Text } from 'degen';
 
 import { useSDK } from 'helpers/sdk';
 import { useGovernor, useGovernorParams } from 'hooks/tribeca/useGovernor';
 // import { notify } from '../../../../../../../utils/notifications';
-import { HelperCard } from 'components/HelperCard';
+import { HelperCard } from 'components/common/HelperCard';
 import type { ModalProps } from 'components/Modal';
 import { Modal } from 'components/Modal';
 import { ModalInner } from 'components/Modal/ModalInner';
 import { ProposalIX } from './ProposalIX';
-import { useRouter } from 'next/router';
-import { Box, IconLink, Text } from 'degen';
 
 type Props = Omit<ModalProps, 'children'> & {
   proposal: {
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
index 83fde3f0..9b677e16 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -17,7 +17,7 @@ import { useGovernor } from 'hooks/tribeca/useGovernor';
 // import { LabeledInput } from '../../../../../common/inputs/LabeledInput';
 import { ProposalConfirmModal } from './ProposalConfirmationModal';
 import { ProposalTXForm } from './ProposalTXForm';
-import { HelperCard } from 'components/HelperCard';
+import { HelperCard } from 'components/common/HelperCard';
 import { Box, Button, Card, Heading, Input, Textarea, Text } from 'degen';
 import { AsyncButton } from 'components/AsyncButton';
 
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
index 3e828088..c09d95ce 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
@@ -4,7 +4,7 @@ import type { ActionType } from 'actions/types';
 import { ACTIONS } from 'actions/types';
 import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
 import { useGovernor } from 'hooks/tribeca/useGovernor';
-import { HelperCard } from 'components/HelperCard';
+import { HelperCard } from 'components/common/HelperCard';
 import { Box, Field, Spinner, Text } from 'degen';
 // import { Select } from '../../../../../common/inputs/InputText';
 // import { LoadingPage } from '../../../../../common/LoadingPage';
diff --git a/components/Proposals/ProposalIndexView/index.tsx b/components/Proposals/ProposalIndexView/index.tsx
new file mode 100644
index 00000000..aebe5703
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/index.tsx
@@ -0,0 +1,6 @@
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { ProposalIndexView as LockedVoter } from './locked-voter';
+
+export const ProposalIndexView: React.FC = () => {
+  return <LockedVoter />;
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
new file mode 100644
index 00000000..b276a848
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
@@ -0,0 +1,81 @@
+import { useSail } from '@saberhq/sail';
+import { createMemoInstruction } from '@saberhq/solana-contrib';
+import type { VoteSide } from '@tribecahq/tribeca-sdk';
+import { useState } from 'react';
+import invariant from 'tiny-invariant';
+
+import { useSDK } from 'helpers/sdk';
+import { useUserEscrow } from 'hooks/tribeca/useEscrow';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { useVote } from 'hooks/tribeca/useVote';
+import { ModalInner } from 'components/Modal/ModalInner';
+import { VOTE_SIDE_LABEL } from '../VotesCard';
+import { VoteResult } from './VoteResult';
+import { VoteSelectContents } from './VoteSelectContents';
+
+interface Props {
+  proposalInfo: ProposalInfo;
+}
+
+export const CastVoteModal: React.FC<Props> = ({ proposalInfo }: Props) => {
+  const { data: escrow } = useUserEscrow();
+  const { handleTX } = useSail();
+  const { sdkMut } = useSDK();
+  const { data: myVote } = useVote(
+    proposalInfo.proposalKey,
+    sdkMut?.provider.wallet.publicKey
+  );
+
+  const [side, setSide] = useState<VoteSide | null>(
+    myVote?.accountInfo.data.side ?? null
+  );
+  const [reason, setReason] = useState<string>('');
+  const [hasVoted, setHasVoted] = useState<boolean>(false);
+
+  const vote = async () => {
+    invariant(escrow && side);
+    const tx = await escrow.escrowW.castVote({
+      proposal: proposalInfo.proposalKey,
+      side
+    });
+    const memoIX = createMemoInstruction(reason, [
+      escrow.escrowW.provider.wallet.publicKey
+    ]);
+    tx.addInstructions(memoIX);
+    const { pending } = await handleTX(tx, `Vote ${VOTE_SIDE_LABEL[side]}`);
+    if (!pending) {
+      return;
+    }
+    await pending.wait();
+    setHasVoted(true);
+  };
+
+  if (side && hasVoted) {
+    return (
+      <VoteResult side={side} proposalInfo={proposalInfo} reason={reason} />
+    );
+  }
+
+  return (
+    <ModalInner
+      title="Cast Vote"
+      // tw="px-6 max-w-md"
+      buttonProps={{
+        disabled: !(side && escrow),
+        onClick: vote,
+        variant: 'primary',
+        children: side
+          ? `Cast ${VOTE_SIDE_LABEL[side]} Vote`
+          : 'Select a Vote Side'
+      }}
+    >
+      <VoteSelectContents
+        proposal={proposalInfo}
+        side={side}
+        setSide={setSide}
+        reason={reason}
+        setReason={setReason}
+      />
+    </ModalInner>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx
new file mode 100644
index 00000000..574ddcc5
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx
@@ -0,0 +1,99 @@
+import { VoteSide } from '@tribecahq/tribeca-sdk';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+// import { Button } from '../../../../../../common/Button';
+import { ModalInner } from 'components/Modal/ModalInner';
+import { VOTE_SIDE_LABEL } from '../VotesCard';
+import { Box, Stack, Text } from 'degen';
+
+interface Props {
+  proposalInfo: ProposalInfo;
+  side: VoteSide;
+  reason: string | null;
+}
+
+const formatTweet = ({
+  daoName,
+  proposal,
+  side,
+  reason
+}: {
+  daoName: string;
+  proposal: ProposalInfo;
+  side: VoteSide;
+  reason: string | null;
+}) =>
+  [
+    `I ${
+      side !== VoteSide.Abstain
+        ? `voted ${VOTE_SIDE_LABEL[side].toLowerCase()}`
+        : `abstained from voting on`
+    } ${daoName} Proposal #${proposal.index}${
+      proposal.proposalMetaData?.title
+        ? `: ${proposal.proposalMetaData.title}`
+        : ''
+    }`,
+    reason,
+    `Vote here: ${window.location.href}`
+  ]
+    .filter(s => !!s)
+    .join('\n\n');
+
+export const VoteResult: React.FC<Props> = ({
+  proposalInfo,
+  side,
+  reason
+}: Props) => {
+  return (
+    <ModalInner
+      title="Vote Confirmed"
+      // tw="px-6 max-w-md"
+    >
+      <Stack align="center">
+        <Box
+          display="flex"
+          flexDirection="column"
+          alignItems="center"
+          maxWidth="screenSm"
+          gap="3"
+        >
+          <Text as="h2" size="large" color="white" weight="semiBold">
+            You{' '}
+            {side !== VoteSide.Abstain
+              ? `voted ${VOTE_SIDE_LABEL[side].toLowerCase()}`
+              : `abstained from voting on`}
+            <br />
+            {proposalInfo.proposalMetaData?.title ??
+              `Proposal #${proposalInfo.index}`}
+          </Text>
+          <Text as="p" size="small">
+            Help spread the word for your
+            <br />
+            choice to win the vote:
+          </Text>
+        </Box>
+        {/* <div tw="mt-8">
+          {daoName && (
+            <a
+              target="_blank"
+              href={`https://twitter.com/intent/tweet?text=${encodeURIComponent(
+                formatTweet({
+                  daoName,
+                  proposal: proposalInfo,
+                  side,
+                  reason
+                })
+              )}`}
+              rel="noreferrer"
+            >
+              <Button variant="primary" size="md">
+                Tweet your {side === VoteSide.For ? 'support' : 'stance'}
+              </Button>
+            </a>
+          )}
+        </div> */}
+      </Stack>
+    </ModalInner>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx
new file mode 100644
index 00000000..612a0ed4
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx
@@ -0,0 +1,161 @@
+import { Box, Button, Text, Textarea } from 'degen';
+import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { sum } from 'lodash';
+import invariant from 'tiny-invariant';
+
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { FORMAT_VOTE_PERCENT } from 'helpers/format';
+import { HelperCard } from 'components/common/HelperCard';
+import { sideColor } from 'helpers/utils';
+import { VOTE_SIDE_LABEL } from '../VotesCard';
+import { Meter } from 'components/common/governance/Meter';
+
+interface Props {
+  proposal: ProposalInfo;
+
+  side: VoteSide | null;
+  setSide: (side: VoteSide) => void;
+  reason: string;
+  setReason: (reason: string) => void;
+}
+
+export const VoteSelectContents: React.FC<Props> = ({
+  proposal,
+  side,
+  setSide,
+  reason,
+  setReason
+}: Props) => {
+  const allVotes = (['forVotes', 'againstVotes', 'abstainVotes'] as const).map(
+    vote => proposal.proposalData[vote].toNumber()
+  );
+  const totalVotes = sum(allVotes);
+  return (
+    <Box display="grid" gap="4">
+      <Box display="flex" flexDirection="column" alignItems="center">
+        <Text as="h2" color="white" weight="semiBold">
+          Your Ballot for Proposal #{proposal.index}
+        </Text>
+      </Box>
+      <HelperCard variant="muted">
+        <Text as="p">Select one of the options below to cast your vote.</Text>
+      </HelperCard>
+      <Box display="flex" flexDirection="column" gap="4" width="full">
+        {([VoteSide.For, VoteSide.Against, VoteSide.Abstain] as const).map(
+          (voteSide, i) => {
+            const myVotes = allVotes[i];
+            invariant(typeof myVotes === 'number');
+            const percent = FORMAT_VOTE_PERCENT.format(
+              totalVotes === 0 ? 0 : myVotes / totalVotes
+            );
+            return (
+              <Button
+                // tw="flex items-center gap-4 px-5 py-4 border rounded border-warmGray-600 transition-all"
+                key={voteSide}
+                // css={[
+                //   side === voteSide && {
+                //     borderColor: sideColor(voteSide)
+                //   }
+                // ]}
+                onClick={() => setSide(voteSide)}
+              >
+                <Box>
+                  <Box
+                    width="6"
+                    height="6"
+                    // css={[tw`border border-gray-500`, tw`w-6 h-6`]}
+                  >
+                    <svg
+                      // tw="w-full h-full"
+                      // css={[
+                      //   css`
+                      //     stroke-width: 15px;
+                      //     fill: none;
+                      //     & > path {
+                      //       stroke: ${sideColor(voteSide)};
+                      //     }
+                      //   `,
+                      //   side === voteSide &&
+                      //     css`
+                      //       & > path {
+                      //         stroke-dashoffset: 0;
+                      //         transition: stroke-dashoffset 0.1s ease-in 0s;
+                      //       }
+                      //     `
+                      // ]}
+                      viewBox="0 0 100 100"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      {voteSide === VoteSide.For ? (
+                        <path
+                          d="M 10 50 L 40 86 L 90 10"
+                          strokeDasharray="140"
+                          strokeDashoffset="140"
+                        ></path>
+                      ) : (
+                        <>
+                          <path
+                            d="M 10 10 L 90 90"
+                            strokeDasharray="113"
+                            strokeDashoffset="113"
+                          ></path>
+                          <path
+                            d="M 90 10 L 10 90"
+                            strokeDasharray="113"
+                            strokeDashoffset="113"
+                          ></path>
+                        </>
+                      )}
+                    </svg>
+                  </Box>
+                </Box>
+                <Box display="flex" flexDirection="column" flexGrow={1}>
+                  <Box
+                    width="full"
+                    display="flex"
+                    alignItems="center"
+                    justifyContent="center"
+                  >
+                    <Box color="white" fontWeight="medium">
+                      {VOTE_SIDE_LABEL[voteSide]}
+                    </Box>
+                    <Box fontWeight="medium" color="accentText">
+                      {percent}
+                    </Box>
+                  </Box>
+                  <Meter
+                    value={myVotes}
+                    max={totalVotes === 0 ? 1 : totalVotes}
+                    barColor={sideColor(voteSide)}
+                  />
+                </Box>
+              </Button>
+            );
+          }
+        )}
+      </Box>
+      <Box marginTop="8">
+        {/* <label htmlFor="reason" tw="flex flex-col gap-2"> */}
+        {/* <span tw="font-medium text-white text-sm">
+            Add Reason (max 200 characters)
+          </span> */}
+        <Textarea
+          id="reason"
+          label={
+            <Text as="span" color="white" size="small" weight="medium">
+              Add reason (max 200 characters)
+            </Text>
+          }
+          hideLabel
+          // tw="resize-none h-auto"
+          maxLength={200}
+          placeholder="Tell others why you are voting this way"
+          rows={4}
+          value={reason}
+          onChange={e => setReason(e.target.value)}
+        />
+        {/* </label> */}
+      </Box>
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
new file mode 100644
index 00000000..47ef4849
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
@@ -0,0 +1,34 @@
+import { VoteSide } from '@tribecahq/tribeca-sdk';
+
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { ModalButton } from 'components/Modal/ModalButton';
+import { CastVoteModal } from './CastVoteModal';
+
+interface Props {
+  proposalInfo: ProposalInfo;
+  side: VoteSide | null;
+}
+
+export const CastVoteButton: React.FC<Props> = ({
+  proposalInfo,
+  side
+}: Props) => {
+  return (
+    <ModalButton
+      // tw="max-w-md"
+      buttonProps={{
+        variant: 'outline'
+        // css: tw`border-white w-2/5 hover:(border-primary bg-primary bg-opacity-20)`
+      }}
+      buttonLabel={
+        side === null // Vote account not yet created
+          ? 'Cast Vote'
+          : side === VoteSide.Pending
+          ? 'Cast Vote'
+          : 'Change Vote'
+      }
+    >
+      <CastVoteModal proposalInfo={proposalInfo} />
+    </ModalButton>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx
new file mode 100644
index 00000000..f8f06105
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx
@@ -0,0 +1,63 @@
+import { startCase } from 'lodash';
+
+import { useParsedInstruction } from 'hooks/useParsedInstruction';
+import type { ParsedInstruction } from 'hooks/useSmartWallet';
+import { shortenAddress } from 'helpers/utils';
+// import { AddressLink } from 'components/common/AddressLink';
+// import { InstructionDisplay } from '../../../../../wallet/tx/TransactionView/TransactionIndexView/InstructionDisplay';
+import { Box, Text } from 'degen';
+
+interface Props {
+  index: number;
+  instruction: ParsedInstruction;
+}
+
+export const InstructionPreview: React.FC<Props> = ({
+  instruction,
+  index
+}: Props) => {
+  const parsed = useParsedInstruction(instruction.ix);
+  return (
+    <Box
+      display="grid"
+      borderRadius="medium"
+      borderWidth="px"
+      // tw="grid border dark:border-warmGray-700 rounded"
+    >
+      <Box fontSize="small" padding="4">
+        <Text
+          as="h2"
+          weight="semiBold"
+          // tw="font-semibold text-gray-800 dark:text-white mb-2"
+        >
+          IX #{index + 1}:{' '}
+          {parsed?.title ??
+            startCase(
+              (instruction.parsed && 'name' in instruction.parsed
+                ? instruction.parsed.name
+                : null) ?? 'Unknown'
+            )}
+        </Text>
+        <Text as="p" size="small">
+          <Text as="span" weight="medium">
+            Program:
+          </Text>{' '}
+          {/* <AddressLink
+            tw="font-semibold text-secondary"
+            address={instruction.ix.programId}
+          >
+            {instruction.programName} (
+            {shortenAddress(instruction.ix.programId.toString())})
+          </AddressLink> */}
+        </Text>
+      </Box>
+      <Box
+        padding="4"
+        borderTopWidth="px"
+        // tw="p-4 border-t dark:border-t-warmGray-600"
+      >
+        {/* <InstructionDisplay parsed={parsed} instruction={instruction} /> */}
+      </Box>
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx
new file mode 100644
index 00000000..3e5b0be9
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx
@@ -0,0 +1,18 @@
+import { Box } from 'degen';
+// import { useTransaction } from '../../../../../wallet/tx/TransactionView/context';
+import { InstructionPreview } from './InstructionPreview';
+
+export const InstructionsInner: React.FC = () => {
+  // const { instructions } = useTransaction();
+  return (
+    <Box display="grid" gap="4">
+      {/* {instructions?.map((instruction, i) => (
+        <InstructionPreview
+          key={`ix_${i}`}
+          instruction={instruction}
+          index={i}
+        />
+      ))} */}
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx
new file mode 100644
index 00000000..c8aa8ae2
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx
@@ -0,0 +1,27 @@
+import type { PublicKey } from '@solana/web3.js';
+import { Box, Spinner } from 'degen';
+
+import { useParsedTXByKey } from 'hooks/useParsedTX';
+import { SmartWalletProvider } from 'hooks/useSmartWallet';
+// import { TransactionProvider } from '../../../../../wallet/tx/TransactionView/context';
+import { InstructionsInner } from './InstructionsInner';
+
+interface Props {
+  txKey: PublicKey;
+}
+
+export const EmbedTX: React.FC<Props> = ({ txKey }: Props) => {
+  const { data: parsedTX, isLoading } = useParsedTXByKey(txKey);
+  return (
+    <Box paddingY="6">
+      {isLoading && !parsedTX && <Spinner />}
+      {parsedTX && (
+        <SmartWalletProvider initialState={parsedTX.tx.account.smartWallet}>
+          {/* <TransactionProvider initialState={parsedTX}>
+            <InstructionsInner />
+          </TransactionProvider> */}
+        </SmartWalletProvider>
+      )}
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx
new file mode 100644
index 00000000..134797a1
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx
@@ -0,0 +1,71 @@
+import { Box, Stack, Text } from 'degen';
+import formatDistance from 'date-fns/formatDistance';
+
+import { Card } from 'components/common/governance/Card';
+// import { ProseSmall } from 'components/common/typography/Prose';
+import type { GitHubIssue } from '../github';
+import { useGitHubIssueComments } from '../github';
+
+interface Props {
+  issue: GitHubIssue;
+}
+
+export const GitHubComments: React.FC<Props> = ({ issue }: Props) => {
+  const { data: githubComments } = useGitHubIssueComments(issue.comments_url);
+  return (
+    <Card title={`Comments (${issue.comments})`} padded>
+      {/* <ProseSmall> */}
+      <Stack space="4">
+        {githubComments?.map(comment => (
+          <Box key={comment.id} display="flex" width="full" gap="4">
+            <img
+              src={comment.user?.avatar_url ?? ''}
+              tw="w-8 h-8 rounded-full"
+              alt={`Profile of ${comment.user?.login ?? ''}`}
+            />
+            <Box
+              flex={1}
+              display="flex"
+              borderWidth="px"
+              borderRadius="large"
+              // tw="border rounded-lg border-warmGray-700 flex-1"
+            >
+              <Box
+                paddingX="4"
+                paddingY="2"
+                borderBottomWidth="px"
+                borderTopRadius="large"
+                // tw="px-4 py-2 bg-warmGray-800 border-b border-b-warmGray-700 rounded-t-lg"
+              >
+                <a
+                  href={comment.user?.html_url}
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  {comment.user?.login}
+                </a>{' '}
+                <Text as="span">
+                  commented{' '}
+                  {formatDistance(new Date(comment.created_at), new Date(), {
+                    addSuffix: true
+                  })}
+                </Text>
+              </Box>
+              <Box paddingX="5" paddingY="3">
+                {comment.body}
+              </Box>
+            </Box>
+          </Box>
+        ))}
+      </Stack>
+      <div tw="w-full text-center py-8">
+        Got something to say? Add a comment to the{' '}
+        <a href={issue.html_url} target="_blank" rel="noreferrer">
+          proposal on GitHub
+        </a>
+        .
+      </div>
+      {/* </ProseSmall> */}
+    </Card>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/index.tsx
new file mode 100644
index 00000000..07d83817
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/index.tsx
@@ -0,0 +1,34 @@
+import { Box } from 'degen';
+import ReactMarkdown from 'react-markdown';
+
+// import { Prose } from '../../../../../../common/typography/Prose';
+import type { GitHubIssue } from '../github';
+
+interface Props {
+  description: string;
+  issue?: GitHubIssue | null;
+}
+
+export const ProposalBody: React.FC<Props> = ({
+  description,
+  issue
+}: Props) => {
+  return (
+    <Box as="article" color="text">
+      {/* <Prose> */}
+      {issue && (
+        <Box
+          paddingBottom="8"
+          marginBottom="8"
+          borderBottomWidth="px"
+          color="text"
+          // tw="border-b border-b-gray-700 pb-8 mb-8"
+        >
+          <ReactMarkdown linkTarget="_blank">{issue.body ?? ''}</ReactMarkdown>
+        </Box>
+      )}
+      <ReactMarkdown linkTarget="_blank">{description}</ReactMarkdown>
+      {/* </Prose> */}
+    </Box>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx
new file mode 100644
index 00000000..58a434b4
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx
@@ -0,0 +1,60 @@
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { Card } from 'components/common/governance/Card';
+// import { IXSummary } from '../../../../../common/governance/IXSummary';
+// import { TransactionPreviewLink } from '../../../../../common/governance/TransactionPreviewLink';
+import { extractGitHubIssueURL, useGitHubIssue } from './github';
+import { ProposalBody } from './ProposalBody';
+import { GitHubComments } from './ProposalBody/GitHubComments';
+import { Box, Text } from 'degen';
+
+interface Props {
+  className?: string;
+  proposalInfo?: ProposalInfo | null;
+}
+
+export const ProposalDetails: React.FC<Props> = ({
+  className,
+  proposalInfo
+}: Props) => {
+  const description = proposalInfo?.proposalMetaData?.descriptionLink ?? '';
+
+  const issueURL = extractGitHubIssueURL(description);
+  const { data: githubIssue } = useGitHubIssue(issueURL);
+
+  return (
+    <>
+      <Card className={className} title="Details">
+        <Box>
+          {proposalInfo?.proposalData.instructions.map((ix, i) => (
+            <Box
+              key={i}
+              display="flex"
+              paddingX="7"
+              paddingY="5"
+              borderBottomWidth="px"
+              // tw="px-7 py-5 border-b border-warmGray-800 flex"
+            >
+              <Text weight="medium">{i + 1}</Text>
+              <Box flex={1} color="white">
+                {/* <IXSummary instruction={ix} /> */}
+              </Box>
+            </Box>
+          ))}
+        </Box>
+        <Box padding="7">
+          {/* {proposalInfo &&
+            !proposalInfo.status.executed &&
+            proposalInfo.proposalData.instructions.length > 0 && (
+              <TransactionPreviewLink
+                instructions={proposalInfo.proposalData.instructions}
+              />
+            )} */}
+          <Box {...(!proposalInfo?.status.executed && { marginTop: '7' })}>
+            <ProposalBody description={description} issue={githubIssue} />
+          </Box>
+        </Box>
+      </Card>
+      {githubIssue && <GitHubComments issue={githubIssue} />}
+    </>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx
new file mode 100644
index 00000000..727184c4
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx
@@ -0,0 +1,52 @@
+import { Helmet } from "react-helmet";
+
+import { useCardinalName } from "../../../../../../hooks/cardinal/useAddressName";
+import { useGovernor } from "../../../../../../hooks/tribeca/useGovernor";
+import type { ProposalInfo } from "../../../../../../hooks/tribeca/useProposals";
+import { tsToDate } from "../../../../../../utils/utils";
+
+interface Props {
+  proposalInfo: ProposalInfo;
+}
+
+export const ProposalHelmet: React.FC<Props> = ({ proposalInfo }: Props) => {
+  const { daoName } = useGovernor();
+  const { index } = proposalInfo;
+
+  const cardinalName = useCardinalName(proposalInfo.proposalData.proposer);
+  const author = cardinalName ?? proposalInfo.proposalData.proposer.toString();
+  const twitterName = cardinalName?.startsWith("@") ? cardinalName : null;
+
+  const title = proposalInfo?.proposalMetaData
+    ? `${daoName ?? "Governance"} Proposal #${index}: ${
+        proposalInfo.proposalMetaData.title
+      }`
+    : `${daoName ?? "Governance"} Proposal #${index}`;
+
+  const description = proposalInfo.proposalMetaData
+    ? proposalInfo.proposalMetaData.descriptionLink.slice(0, 200)
+    : null;
+
+  return (
+    <Helmet>
+      <title>
+        {title} | {daoName}
+      </title>
+
+      {description && <meta name="description" content={description} />}
+      {description && <meta name="og:description" content={description} />}
+      {description && <meta name="twitter:description" content={description} />}
+
+      <meta name="og:title" content={title} />
+      <meta name="og:type" content="article" />
+      <meta
+        name="og:article:published_time"
+        content={tsToDate(proposalInfo.proposalData.createdAt).toISOString()}
+      />
+      {author && <meta name="og:article:author" content={author} />}
+
+      <meta name="twitter:title" content={title} />
+      {twitterName && <meta name="twitter:creator" content={twitterName} />}
+    </Helmet>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
new file mode 100644
index 00000000..79d1582a
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
@@ -0,0 +1,132 @@
+import type { SmartWalletTransactionData } from '@gokiprotocol/client';
+import type { ProgramAccount } from '@saberhq/token-utils';
+import type { ProposalData } from '@tribecahq/tribeca-sdk';
+import {
+  getProposalState,
+  PROPOSAL_STATE_LABELS,
+  ProposalState
+} from '@tribecahq/tribeca-sdk';
+import BN from 'bn.js';
+import { startCase } from 'lodash';
+import { Box, IconLink, Text } from 'degen';
+
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { useGokiTransactionData } from 'helpers/parser';
+import { Card } from 'components/common/governance/Card';
+
+const ZERO = new BN(0);
+interface Props {
+  className?: string;
+  proposalInfo?: ProposalInfo | null;
+}
+
+interface ProposalEvent {
+  title: string;
+  date: Date;
+  link?: string | null;
+}
+
+export const makeDate = (num: BN): Date => new Date(num.toNumber() * 1_000);
+
+const extractEvents = (
+  proposalData: ProposalData,
+  tx: ProgramAccount<SmartWalletTransactionData>
+): ProposalEvent[] => {
+  const events: ProposalEvent[] = [];
+  if (!proposalData.canceledAt.eq(ZERO)) {
+    events.push({ title: 'Canceled', date: makeDate(proposalData.canceledAt) });
+  }
+  if (!proposalData.activatedAt.eq(ZERO)) {
+    events.push({
+      title: 'Activated',
+      date: makeDate(proposalData.activatedAt)
+    });
+  }
+  if (!proposalData.createdAt.eq(ZERO)) {
+    events.push({ title: 'Created', date: makeDate(proposalData.createdAt) });
+  }
+  if (!proposalData.queuedAt.eq(ZERO)) {
+    events.push({
+      title: 'Queued',
+      date: makeDate(proposalData.queuedAt),
+      link: tx
+        ? `https://goki.so/#/wallets/${tx.account.smartWallet.toString()}/tx/${tx.account.index.toString()}`
+        : null
+    });
+  }
+  if (
+    !proposalData.votingEndsAt.eq(ZERO) &&
+    makeDate(proposalData.votingEndsAt) <= new Date()
+  ) {
+    // TODO: update quorum
+    const state = getProposalState({ proposalData });
+    events.push({
+      title: startCase(
+        PROPOSAL_STATE_LABELS[
+          state === ProposalState.Queued ? ProposalState.Succeeded : state
+        ]
+      ),
+      date: makeDate(proposalData.votingEndsAt)
+    });
+  }
+  if (tx?.account.executedAt.gt(new BN(0))) {
+    events.push({
+      title: 'Executed',
+      date: makeDate(tx.account.executedAt),
+      link: tx
+        ? `https://goki.so/#/wallets/${tx.account.smartWallet.toString()}/tx/${tx.account.index.toString()}`
+        : null
+    });
+  }
+  return events.sort((a, b) => (a.date < b.date ? -1 : 1));
+};
+
+export const ProposalHistory: React.FC<Props> = ({
+  className,
+  proposalInfo
+}: Props) => {
+  const { data: tx } = useGokiTransactionData(
+    !proposalInfo?.proposalData.queuedAt.eq(ZERO)
+      ? proposalInfo?.proposalData.queuedTransaction
+      : null
+  );
+  const events =
+    proposalInfo && tx ? extractEvents(proposalInfo.proposalData, tx) : [];
+  return (
+    <Card className={className} title="Proposal History">
+      <Box display="grid" paddingX="7" paddingY="4" gap="4">
+        {events.map(({ title, date, link }, i) => (
+          <Box key={i}>
+            <Box
+              display="flex"
+              alignItems="center"
+              justifyContent="space-between"
+            >
+              <Box display="flex" flexDirection="column" fontSize="small">
+                <Text color="white">{title}</Text>
+                <Text as="span" size="small">
+                  {date.toLocaleDateString(undefined, {
+                    month: 'long',
+                    day: 'numeric',
+                    year: 'numeric'
+                  })}{' '}
+                  &mdash; {date.toLocaleTimeString()}
+                </Text>
+              </Box>
+              {link && (
+                <a
+                  href={link}
+                  // tw="text-primary hover:text-white transition-colors"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  <IconLink />
+                </a>
+              )}
+            </Box>
+          </Box>
+        ))}
+      </Box>
+    </Card>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx b/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
new file mode 100644
index 00000000..73ce423e
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
@@ -0,0 +1,80 @@
+import { Fraction } from '@saberhq/token-utils';
+import type { ProposalData } from '@tribecahq/tribeca-sdk';
+import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { Box, Spinner } from 'degen';
+import BN from 'bn.js';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { Card } from 'components/common/governance/Card';
+import { Meter } from 'components/common/governance/Meter';
+
+export const VOTE_SIDE_LABEL = {
+  [VoteSide.For]: 'For',
+  [VoteSide.Against]: 'Against',
+  [VoteSide.Abstain]: 'Abstain',
+  [VoteSide.Pending]: 'Pending'
+} as const;
+
+interface Props {
+  side: VoteSide.For | VoteSide.Against;
+  proposal: ProposalData | null;
+}
+
+export const VotesCard: React.FC<Props> = ({ side, proposal }: Props) => {
+  const { veToken } = useGovernor();
+  const voteCount = !proposal
+    ? null
+    : side === VoteSide.For
+    ? proposal.forVotes
+    : side === VoteSide.Against
+    ? proposal.againstVotes
+    : new BN(0);
+
+  const voteCountFmt =
+    veToken && voteCount !== null ? (
+      new Fraction(voteCount, 10 ** veToken.decimals).asNumber.toLocaleString(
+        undefined,
+        {
+          maximumFractionDigits: 0
+        }
+      )
+    ) : (
+      <Spinner />
+    );
+
+  const totalDeterminingVotes = !proposal
+    ? null
+    : proposal.forVotes.add(proposal.againstVotes);
+
+  return (
+    <Card
+      title={
+        <Box display="flex" flexDirection="column" gap="3.5" width="full">
+          <Box
+            display="flex"
+            alignItems="center"
+            justifyContent="space-between"
+          >
+            <Box>{VOTE_SIDE_LABEL[side]}</Box>
+            <Box>{voteCountFmt}</Box>
+          </Box>
+          <Meter
+            value={voteCount ?? new BN(0)}
+            max={BN.max(totalDeterminingVotes ?? new BN(0), new BN(1))}
+            barColor="primary"
+            // barColor={
+            //   side === VoteSide.For
+            //     ? theme`colors.primary`
+            //     : theme`colors.red.500`
+            // }
+          />
+        </Box>
+      }
+      // titleStyles={tw`h-20`}
+      // link={{
+      //   title: "View All",
+      //   href: "",
+      // }}
+    />
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
new file mode 100644
index 00000000..3f5a70e2
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
@@ -0,0 +1,175 @@
+import { useSail, useTXHandlers } from '@saberhq/sail';
+import { sleep } from '@saberhq/token-utils';
+import { useEffect, useMemo } from 'react';
+import invariant from 'tiny-invariant';
+import { Box, Spinner, Text, Button, Stack } from 'degen';
+
+import { useUserEscrow } from 'hooks/tribeca/useEscrow';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { formatDurationSeconds } from 'helpers/format';
+// import { Button } from '../../../../../../common/Button';
+import { Card } from 'components/common/governance/Card';
+import Link from 'next/link';
+// import { LoadingPage } from '../../../../../../common/LoadingPage';
+
+interface Props {
+  proposal: ProposalInfo;
+  onActivate: () => void;
+}
+
+export const ProposalActivate: React.FC<Props> = ({
+  proposal,
+  onActivate
+}: Props) => {
+  const { minActivationThreshold, governorData } = useGovernor();
+  const { data: escrow, veBalance, refetch } = useUserEscrow();
+  const { handleTX } = useSail();
+  const { governorW } = useGovernor();
+  const { signAndConfirmTX } = useTXHandlers();
+
+  const earliestActivationTime = useMemo(
+    () =>
+      governorData
+        ? new Date(
+            proposal.proposalData.createdAt
+              .add(governorData.account.params.votingDelay)
+              .toNumber() * 1_000
+          )
+        : null,
+    [governorData, proposal.proposalData.createdAt]
+  );
+
+  useEffect(() => {
+    if (!earliestActivationTime) {
+      return;
+    }
+    const remainingTime = earliestActivationTime.getTime() - Date.now();
+    const timeout = setTimeout(() => {
+      void refetch();
+    }, remainingTime + 1);
+    return () => clearTimeout(timeout);
+  }, [earliestActivationTime, refetch]);
+
+  return (
+    <Card title="Actions">
+      <Box
+        paddingX="7"
+        paddingY="4"
+        fontSize="small"
+        display="flex"
+        flexDirection="column"
+        alignItems="center"
+      >
+        {!earliestActivationTime || !governorData ? (
+          <Spinner />
+        ) : earliestActivationTime > new Date() ? (
+          <Box display="flex" flexDirection="column" gap="4">
+            <Text as="p">
+              You must wait{' '}
+              {formatDurationSeconds(
+                governorData.account.params.votingDelay.toNumber()
+              )}{' '}
+              for this proposal to be activated.
+            </Text>
+            <Text as="p">
+              The proposal may be activated at{' '}
+              {earliestActivationTime?.toLocaleString(undefined, {
+                timeZoneName: 'short'
+              })}{' '}
+              by anyone who possesses at least{' '}
+              {minActivationThreshold?.formatUnits()}.
+            </Text>
+          </Box>
+        ) : minActivationThreshold &&
+          veBalance?.greaterThan(minActivationThreshold) ? (
+          <Box display="flex" justifyContent="center" alignItems="center">
+            <Button
+              disabled={!escrow}
+              // tw="w-3/4 dark:text-white hover:dark:text-primary hover:dark:border-primary"
+              variant="tertiary"
+              onClick={async () => {
+                invariant(escrow);
+                const tx = escrow.escrowW.activateProposal(
+                  proposal.proposalKey
+                );
+                await signAndConfirmTX(tx, 'Activate Proposal');
+                await sleep(1_000);
+                await refetch();
+                onActivate();
+              }}
+            >
+              Activate Proposal
+            </Button>
+          </Box>
+        ) : (
+          <Box display="flex" flexDirection="column" gap="4">
+            <Text as="p">
+              You must have at least{' '}
+              <strong>{minActivationThreshold?.formatUnits()}</strong> to
+              activate this proposal for voting.
+            </Text>
+            {veBalance ? (
+              <Text as="p">You currently have {veBalance?.formatUnits()}.</Text>
+            ) : (
+              <Text as="p">
+                You currently don&apos;t have any tokens vote locked.
+              </Text>
+            )}
+            <Box
+              // as={Link}
+              display="flex"
+              alignItems="center"
+              justifyContent="center"
+              href="locker"
+            >
+              <Box width="3/4" marginTop="4" textAlign="center">
+                <Button width="full" size="small">
+                  Lock Tokens
+                </Button>
+              </Box>
+            </Box>
+          </Box>
+        )}
+        <Box
+          gap="2"
+          marginTop="4"
+          width="full"
+          alignItems="center"
+          flexDirection="column"
+          display="flex"
+        >
+          {governorW &&
+            proposal.proposalData.proposer.equals(
+              governorW.provider.wallet.publicKey
+            ) && (
+              <Box
+                display="flex"
+                alignItems="center"
+                justifyContent="center"
+                width="3/4"
+              >
+                <Button
+                  variant="tertiary"
+                  width="full"
+                  size="small"
+                  onClick={async () => {
+                    const tx = governorW.cancelProposal({
+                      proposal: proposal.proposalKey
+                    });
+                    const handle = await handleTX(tx, 'Cancel Proposal');
+                    if (!handle.pending) {
+                      return;
+                    }
+                    await handle.pending.wait();
+                  }}
+                >
+                  Cancel
+                </Button>
+              </Box>
+            )}
+        </Box>
+      </Box>
+    </Card>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
new file mode 100644
index 00000000..aed8ce70
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
@@ -0,0 +1,177 @@
+import { mapSome, useTXHandlers } from '@saberhq/sail';
+import { TransactionInstruction } from '@solana/web3.js';
+// import pluralize from 'pluralize';
+import Countdown from 'react-countdown';
+import invariant from 'tiny-invariant';
+
+import { useSDK } from 'helpers/sdk';
+import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { useGokiTransactionData } from 'helpers/parser';
+import { gokiTXLink, tsToDate } from 'helpers/utils';
+// import { AsyncConfirmButton } from '../../../../../../common/AsyncConfirmButton';
+// import { Card } from '../../../../../../common/governance/Card';
+// import { ExternalLink } from '../../../../../../common/typography/ExternalLink';
+// import { ProseSmall } from '../../../../../../common/typography/Prose';
+// import { ExecuteProposalButton } from '../../../../GovernanceManageView/tabs/ExecutiveCouncilTab/ExecuteProposalButton';
+import { EmbedTX } from '../EmbedTX';
+import { Card } from 'components/common/governance/Card';
+import { Box, Text } from 'degen';
+import Link from 'next/link';
+
+interface Props {
+  proposal: ProposalInfo;
+  onActivate: () => void;
+}
+
+export const ProposalExecute: React.FC<Props> = ({
+  proposal,
+  onActivate
+}: Props) => {
+  const { governorW, smartWallet, manifest } = useGovernor();
+  const emergencyDAO = manifest?.addresses?.['emergency-dao']?.address;
+  const { sdkMut } = useSDK();
+  const { ecWallet, isMemberOfEC } = useExecutiveCouncil();
+  const { data: gokiTransactionData } = useGokiTransactionData(
+    proposal.proposalData.queuedTransaction
+  );
+  const { signAndConfirmTX } = useTXHandlers();
+
+  if (!gokiTransactionData) {
+    return <></>;
+  }
+
+  const votingEndedAt = tsToDate(proposal.proposalData.queuedAt);
+  const eta = tsToDate(gokiTransactionData.account.eta);
+  const gracePeriodEnd = mapSome(ecWallet.data, d =>
+    !gokiTransactionData.account.eta.isNeg()
+      ? tsToDate(gokiTransactionData.account.eta.add(d.account.gracePeriod))
+      : null
+  );
+
+  const etaSurpassed = eta <= new Date();
+  const gracePeriodSurpassed = mapSome(gracePeriodEnd, g => g <= new Date());
+
+  return (
+    <Card title="Execute Proposal">
+      <Box paddingX="7" paddingY="4" fontSize="small">
+        {/* <ProseSmall> */}
+        <Box marginBottom="4">
+          <Text as="p">
+            The proposal was queued on{' '}
+            <Text as="span" color="white">
+              {votingEndedAt.toLocaleString(undefined, {
+                timeZoneName: 'short'
+              })}
+            </Text>
+            .
+          </Text>
+        </Box>
+        {gracePeriodSurpassed ? (
+          <Text as="p">
+            The proposal execution period expired on{' '}
+            {gracePeriodEnd?.toLocaleString(undefined, {
+              timeZoneName: 'short'
+            })}
+            . This proposal may no longer be executed by the Executive Council.
+          </Text>
+        ) : etaSurpassed ? (
+          <Text as="p">
+            It may now be executed by any member of the{' '}
+            <Link href={'details'}>Executive Council</Link> at any time before{' '}
+            {gracePeriodEnd?.toLocaleString(undefined, {
+              timeZoneName: 'short'
+            })}
+            .
+          </Text>
+        ) : (
+          <Text as="p">
+            It may be executed by any member of the{' '}
+            <Link href={'details'}>Executive Council</Link> in{' '}
+            <Countdown date={eta} />.
+          </Text>
+        )}
+        {/* <ExternalLink tw="mb-4" href={gokiTXLink(gokiTransactionData.account)}>
+          View on Goki
+        </ExternalLink> */}
+        {/* </ProseSmall> */}
+        {/* {isMemberOfEC && (
+          <Box
+            display="flex"
+            justifyContent="space-between"
+            alignItems="center"
+            marginBottom="8"
+          >
+            {gracePeriodSurpassed && emergencyDAO && (
+              <AsyncConfirmButton
+                modal={{
+                  title: 'Revive Proposal via Emergency DAO',
+                  contents: (
+                    <div tw="prose prose-light prose-sm">
+                      <p>
+                        You are about to propose the following{' '}
+                        {pluralize(
+                          'instruction',
+                          gokiTransactionData.account.instructions.length
+                        )}{' '}
+                        on behalf of the emergency DAO:
+                      </p>
+                      <div>
+                        <EmbedTX txKey={gokiTransactionData.publicKey} />
+                      </div>
+                    </div>
+                  )
+                }}
+                disabled={!governorW || !ecWallet.data || !etaSurpassed}
+                tw="w-3/4"
+                variant="primary"
+                onClick={async () => {
+                  invariant(
+                    governorW && sdkMut && smartWallet && ecWallet.data
+                  );
+
+                  const daoWallet = await sdkMut.loadSmartWallet(smartWallet);
+                  const emergencyDAOWallet = await sdkMut.loadSmartWallet(
+                    emergencyDAO
+                  );
+
+                  const { tx: innerTx } = await daoWallet.newTransaction({
+                    proposer: emergencyDAOWallet.key,
+                    instructions: proposal.proposalData.instructions.map(
+                      ix =>
+                        new TransactionInstruction({
+                          ...ix,
+                          data: Buffer.from(ix.data)
+                        })
+                    )
+                  });
+                  const { tx } = await emergencyDAOWallet.newTransaction({
+                    instructions: innerTx.instructions
+                  });
+                  invariant(tx.instructions[0]);
+                  await signAndConfirmTX(tx, `Revive Proposal`);
+                }}
+              >
+                {!etaSurpassed ? (
+                  <>
+                    <Box marginRight="1">
+                      <Text as="span">ETA in</Text>
+                    </Box>
+                    <Countdown date={eta} />
+                  </>
+                ) : (
+                  'Revive Proposal via Emergency DAO'
+                )}
+              </AsyncConfirmButton>
+            )}
+            <ExecuteProposalButton
+              tx={gokiTransactionData}
+              onActivate={onActivate}
+            />
+          </Box>
+        )} */}
+      </Box>
+    </Card>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx
new file mode 100644
index 00000000..cd5794c5
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx
@@ -0,0 +1,60 @@
+import { useSail } from '@saberhq/sail';
+import BN from 'bn.js';
+import invariant from 'tiny-invariant';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { Card } from 'components/common/governance/Card';
+import { Box, Button, Text } from 'degen';
+// import { AsyncButton } from '../../../../../../common/AsyncButton';
+
+interface Props {
+  proposal: ProposalInfo;
+  onActivate: () => void;
+}
+
+export const ProposalQueue: React.FC<Props> = ({
+  proposal,
+  onActivate
+}: Props) => {
+  const { governorW } = useGovernor();
+  const { handleTX } = useSail();
+
+  const votingEndedAt = new Date(
+    proposal.proposalData.votingEndsAt.toNumber() * 1_000
+  );
+
+  return (
+    <Card title="Proposal Passed">
+      <Box paddingX="7" paddingY="4" fontSize="small">
+        <Box marginBottom="4">
+          <Text as="p">
+            The proposal passed successfully on {votingEndedAt.toLocaleString()}
+            .
+          </Text>
+        </Box>
+        <Box display="flex" alignItems="center" justifyContent="space-between">
+          <Button
+            width="3/4"
+            disabled={!governorW}
+            variant="primary"
+            onClick={async () => {
+              invariant(governorW);
+              const tx = await governorW.queueProposal({
+                index: new BN(proposal.index)
+              });
+              const { pending, success } = await handleTX(tx, 'Queue Proposal');
+              if (!pending || !success) {
+                return;
+              }
+              await pending.wait();
+              onActivate();
+            }}
+          >
+            Queue Proposal
+          </Button>
+        </Box>
+      </Box>
+    </Card>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
new file mode 100644
index 00000000..c69140b4
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
@@ -0,0 +1,147 @@
+import { ConnectWalletButton } from '@gokiprotocol/walletkit';
+import { TokenAmount } from '@saberhq/token-utils';
+import type { VoteSide } from '@tribecahq/tribeca-sdk';
+import { VOTE_SIDE_LABELS } from '@tribecahq/tribeca-sdk';
+
+import { useSDK } from 'helpers/sdk';
+import { useUserEscrow } from 'hooks/tribeca/useEscrow';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import type { ProposalInfo } from 'hooks/tribeca/useProposals';
+import { useVote } from 'hooks/tribeca/useVote';
+// import { MouseoverTooltip } from '../../../../../../common/MouseoverTooltip';
+import { sideColor } from 'helpers/utils';
+import { Card } from 'components/common/governance/Card';
+import { CastVoteButton } from '../CastVoteButton';
+import { Box, Button, Text } from 'degen';
+import Link from 'next/link';
+
+interface Props {
+  proposalInfo: ProposalInfo;
+  onVote: () => void;
+}
+
+export const ProposalVote: React.FC<Props> = ({ proposalInfo }: Props) => {
+  const { veToken } = useGovernor();
+  const { sdkMut } = useSDK();
+  const { data: escrow, veBalance } = useUserEscrow();
+  const { data: vote } = useVote(
+    proposalInfo.proposalKey,
+    sdkMut?.provider.wallet.publicKey
+  );
+  const vePower =
+    veToken && escrow
+      ? new TokenAmount(
+          veToken,
+          escrow.calculateVotingPower(
+            proposalInfo.proposalData.votingEndsAt.toNumber()
+          )
+        )
+      : null;
+
+  const lockupTooShort =
+    escrow &&
+    escrow.escrow.escrowEndsAt.lt(proposalInfo.proposalData.votingEndsAt);
+
+  return (
+    <Card
+      title={
+        <Box display="flex">
+          <Text as="span">Vote</Text>
+          {/* {lockupTooShort && (
+            <MouseoverTooltip
+              text={
+                <div tw="max-w-sm">
+                  <p>
+                    Your voting escrow expires before the period which voting
+                    ends. Please extend your lockup to cast your vote.
+                  </p>
+                </div>
+              }
+              placement="bottom-start"
+            >
+              <FaExclamationTriangle tw="h-4 cursor-pointer inline-block align-middle mx-2 mb-0.5 text-yellow-500" />
+            </MouseoverTooltip>
+          )} */}
+        </Box>
+      }
+    >
+      <Box paddingY="8">
+        <Box display="flex" flexDirection="column" alignItems="center" gap="4">
+          {!sdkMut ? (
+            <ConnectWalletButton />
+          ) : !veBalance ? (
+            <Box paddingX="8" fontSize="small" textAlign="center">
+              <Text as="p">
+                You must lock tokens in order to vote on this proposal.
+              </Text>
+              {/* <Link tw="flex justify-center items-center" href={'locker'}> */}
+              <Button
+                // as={Link}
+                href="locker"
+                // variant="outline"
+                // tw="border-white hover:(border-primary bg-primary bg-opacity-20) mt-4"
+              >
+                Lock Tokens
+              </Button>
+              {/* </Link> */}
+            </Box>
+          ) : (
+            <>
+              <Box
+                display="flex"
+                flexDirection="column"
+                alignItems="center"
+                gap="1"
+              >
+                <Text as="span" size="small" weight="medium">
+                  Voting Power
+                </Text>
+                <Text as="span" color="white" weight="semiBold" size="large">
+                  {vePower?.formatUnits()}
+                </Text>
+              </Box>
+              {vote && (
+                <Box
+                  display="flex"
+                  flexDirection="column"
+                  alignItems="center"
+                  gap="1"
+                >
+                  <Text as="span" size="small" weight="medium">
+                    You Voted
+                  </Text>
+                  <Text
+                    as="span"
+                    color="white"
+                    weight="semiBold"
+                    size="large"
+                    // style={
+                    //   vote
+                    //     ? {
+                    //         color: sideColor(vote.accountInfo.data.side)
+                    //       }
+                    //     : {}
+                    // }
+                  >
+                    {VOTE_SIDE_LABELS[vote.accountInfo.data.side as VoteSide]}
+                  </Text>
+                </Box>
+              )}
+              <Box
+                display="flex"
+                width="full"
+                alignItems="center"
+                justifyContent="center"
+              >
+                <CastVoteButton
+                  proposalInfo={proposalInfo}
+                  side={vote ? vote.accountInfo.data.side : null}
+                />
+              </Box>
+            </>
+          )}
+        </Box>
+      </Box>
+    </Card>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/github.ts b/components/Proposals/ProposalIndexView/locked-voter/github.ts
new file mode 100644
index 00000000..aa162d4c
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/github.ts
@@ -0,0 +1,41 @@
+import type { RestEndpointMethodTypes } from "@octokit/plugin-rest-endpoint-methods";
+import { fetchNullable } from "@saberhq/sail";
+import { useQuery } from "react-query";
+
+export type GitHubIssue =
+  RestEndpointMethodTypes["issues"]["get"]["response"]["data"];
+
+export type GitHubComments =
+  RestEndpointMethodTypes["issues"]["listComments"]["response"]["data"];
+
+export const extractGitHubIssueURL = (body: string): string | null => {
+  const match = body.match(
+    /\[View Discussion\]\(https:\/\/github.com\/(\w+)\/(\w+)\/issues\/(\d+)\)/
+  );
+  if (!match) {
+    return null;
+  }
+  const [_, org, repo, issue] = match;
+  if (!org || !repo || !issue) {
+    return null;
+  }
+  return `https://api.github.com/repos/${org}/${repo}/issues/${issue}`;
+};
+
+export const useGitHubIssue = (issueURL: string | null) => {
+  return useQuery(["githubIssue", issueURL], async () => {
+    if (!issueURL) {
+      return null;
+    }
+    return await fetchNullable<GitHubIssue>(issueURL);
+  });
+};
+
+export const useGitHubIssueComments = (commentsURL: string | null) => {
+  return useQuery(["githubIssueComments", commentsURL], async () => {
+    if (!commentsURL) {
+      return null;
+    }
+    return await fetchNullable<GitHubComments>(commentsURL);
+  });
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
new file mode 100644
index 00000000..16689b4d
--- /dev/null
+++ b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
@@ -0,0 +1,126 @@
+import { ProposalState, VoteSide } from '@tribecahq/tribeca-sdk';
+import { noop } from 'lodash';
+import { useRouter } from 'next/router';
+
+import { useProposal } from 'hooks/tribeca/useProposals';
+// import { ContentLoader } from '../../../../../common/ContentLoader';
+import { GovernancePage } from 'components/common/governance/GovernancePage';
+import { Profile } from 'components/common/governance/Profile';
+// import { PlaceholderSubtitle } from '../../../GovernanceOverviewView/locked-voter/ProposalsList/PlaceholderCard';
+// import { ProposalSubtitle } from '../../../GovernanceOverviewView/locked-voter/ProposalsList/ProposalSubtitle';
+import { ProposalActivate } from './actions/ProposalActivate';
+import { ProposalExecute } from './actions/ProposalExecute';
+import { ProposalQueue } from './actions/ProposalQueue';
+import { ProposalVote } from './actions/ProposalVote';
+import { ProposalDetails } from './ProposalDetails';
+import { ProposalHelmet } from './ProposalHelmet';
+import { ProposalHistory } from './ProposalHistory';
+import { VotesCard } from './VotesCard';
+import { Box, Stack, Text } from 'degen';
+
+export const ProposalIndexView: React.FC = () => {
+  const router = useRouter();
+  const proposalIndexStr = router.query.proposalIndex as string;
+  const { info: proposalInfo } = useProposal(parseInt(proposalIndexStr));
+
+  return (
+    <GovernancePage
+      title={
+        <Text
+          as="h1"
+          size="extraLarge"
+          weight="bold"
+          color="white"
+          // tw="text-2xl md:text-3xl font-bold text-white tracking-tighter"
+        >
+          <Box
+            // minHeight="36px"
+            display="flex"
+            alignItems="center"
+            // tw="min-h-[36px] flex items-center break-words hyphens[auto]"
+          >
+            {proposalInfo ? (
+              proposalInfo?.proposalMetaData?.title ?? 'Proposal'
+            ) : (
+              <div></div>
+              // <ContentLoader tw="w-40 h-7" />
+            )}
+          </Box>
+        </Text>
+      }
+      header={
+        <Box display="flex" alignItems="center" gap="2" marginTop="2">
+          {/* <Box
+          //  tw="min-h-[20px]"
+          >
+            {proposalInfo ? (
+              <ProposalSubtitle proposalInfo={proposalInfo} />
+            ) : (
+              <PlaceholderSubtitle />
+            )}
+          </Box> */}
+        </Box>
+      }
+      right={
+        proposalInfo ? (
+          <Box borderRadius="medium" padding="3">
+            {/* <Profile address={proposalInfo.proposalData.proposer} /> */}
+          </Box>
+        ) : undefined
+      }
+    >
+      {/* {proposalInfo && <ProposalHelmet proposalInfo={proposalInfo} />} */}
+      <Box display="grid" gap="4" marginBottom="20">
+        <Stack
+          direction="horizontal"
+          // tw="grid md:grid-cols-2 gap-4"
+        >
+          <Box flex={1}>
+            <VotesCard
+              side={VoteSide.For}
+              proposal={proposalInfo ? proposalInfo.proposalData : null}
+            />
+          </Box>
+          <Box flex={1}>
+            <VotesCard
+              side={VoteSide.Against}
+              proposal={proposalInfo ? proposalInfo.proposalData : null}
+            />
+          </Box>
+        </Stack>
+        <Box
+          display="flex"
+          flexDirection={{ sm: 'column', md: 'row' }}
+          alignItems={{ md: 'flex-start' }}
+          gap="4"
+          // tw="flex flex-col md:(flex-row items-start) gap-4"
+        >
+          <Box display="flex" flex={1} flexDirection="column" gap="4">
+            <ProposalDetails proposalInfo={proposalInfo} />
+          </Box>
+          <Box
+            display="flex"
+            flexDirection="column"
+            width={{ md: '1/3', sm: 'full' }}
+            gap="4"
+            // tw="w-full md:w-[350px] flex flex-col gap-4"
+          >
+            {proposalInfo?.status.state === ProposalState.Draft && (
+              <ProposalActivate proposal={proposalInfo} onActivate={noop} />
+            )}
+            {proposalInfo?.status.state === ProposalState.Active && (
+              <ProposalVote proposalInfo={proposalInfo} onVote={noop} />
+            )}
+            {proposalInfo?.status.state === ProposalState.Succeeded && (
+              <ProposalQueue proposal={proposalInfo} onActivate={noop} />
+            )}
+            {proposalInfo?.status.state === ProposalState.Queued && (
+              <ProposalExecute proposal={proposalInfo} onActivate={noop} />
+            )}
+            <ProposalHistory proposalInfo={proposalInfo} />
+          </Box>
+        </Box>
+      </Box>
+    </GovernancePage>
+  );
+};
diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
index c717b353..bda16b0a 100644
--- a/components/Proposals/ProposalsList/ProposalCard.tsx
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -16,71 +16,79 @@ interface Props {
 }
 
 export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
-  const { path } = useGovernor();
+  // const { path } = useGovernor();
   const { state, executed } = proposalInfo.status;
   return (
     <Link
-      href={`${path}/proposals/${proposalInfo.index}`}
       passHref
+      href={`proposals/${proposalInfo.index}`}
       // tw="flex items-center justify-between py-5 px-6 border-l-2 border-l-transparent border-b border-b-warmGray-800 cursor-pointer hover:border-l-primary"
     >
       <Box
         display="flex"
         alignItems="center"
-        gap="5"
-        width={{ md: '192', xs: '3/4' }}
-        // tw="flex items-center gap-5 w-3/4 md:w-[500px]"
+        justifyContent="space-between"
+        paddingX="6"
+        paddingY="5"
+        // as={Link}
       >
-        {state === ProposalState.Active && <PulsingDot color="decendent" />}
-        <div>
-          <Box display="flex" alignItems="center">
-            <Text
-              color="white"
-              lineHeight="1.375"
-              // tw="text-white leading-snug break-words hyphens[auto]"
-            >
-              {proposalInfo.proposalMetaData?.title.slice(
-                0,
-                PROPOSAL_TITLE_MAX_LEN
-              )}
-            </Text>
-          </Box>
-          {proposalInfo.proposalData && state !== null && (
-            <Box
-              display="flex"
-              flexDirection={{ md: 'row', xs: 'column' }}
-              alignItems={{ md: 'center' }}
-              marginTop={{ md: '4', xs: '2' }}
-              gap="2"
-              // tw="flex flex-col mt-4 gap-2 md:(flex-row items-center mt-2)"
-            >
-              <ProposalStateLabel state={state} executed={executed} />
+        <Box
+          display="flex"
+          alignItems="center"
+          gap="5"
+          width={{ md: '192', xs: '3/4' }}
+          // tw="flex items-center gap-5 w-3/4 md:w-[500px]"
+        >
+          {state === ProposalState.Active && <PulsingDot color="decendent" />}
+          <div>
+            <Box display="flex" alignItems="center">
+              <Text
+                color="white"
+                lineHeight="1.375"
+                // tw="text-white leading-snug break-words hyphens[auto]"
+              >
+                {proposalInfo.proposalMetaData?.title.slice(
+                  0,
+                  PROPOSAL_TITLE_MAX_LEN
+                )}
+              </Text>
+            </Box>
+            {proposalInfo.proposalData && state !== null && (
               <Box
                 display="flex"
-                gap="1"
-                fontSize="small"
-                fontWeight="semiBold"
+                flexDirection={{ md: 'row', xs: 'column' }}
+                alignItems={{ md: 'center' }}
+                marginTop={{ md: '4', xs: '2' }}
+                gap="2"
               >
-                <span>{`000${proposalInfo.index}`.slice(-4)}</span>
-                <span>&middot;</span>
-                <ProposalStateDate proposalInfo={proposalInfo} />
+                <ProposalStateLabel state={state} executed={executed} />
+                <Box
+                  display="flex"
+                  gap="1"
+                  fontSize="small"
+                  fontWeight="semiBold"
+                >
+                  <Text as="span">{`000${proposalInfo.index}`.slice(-4)}</Text>
+                  <Text as="span">&middot;</Text>
+                  <ProposalStateDate proposalInfo={proposalInfo} />
+                </Box>
               </Box>
-            </Box>
-          )}
-        </div>
-      </Box>
-      {state === ProposalState.Active && (
-        <Box width="192">
-          <ActiveProposalVotingBars proposal={proposalInfo} />
+            )}
+          </div>
         </Box>
-      )}
-      {state !== null &&
-        state !== ProposalState.Draft &&
-        state !== ProposalState.Active && (
-          <Box width={{ sm: '16', md: '20', lg: '40' }}>
-            <ProposalStateBadge status={proposalInfo.status} />
+        {state === ProposalState.Active && (
+          <Box width="192">
+            <ActiveProposalVotingBars proposal={proposalInfo} />
           </Box>
         )}
+        {state !== null &&
+          state !== ProposalState.Draft &&
+          state !== ProposalState.Active && (
+            <Box width={{ sm: '16', md: '20', lg: '40' }}>
+              <ProposalStateBadge status={proposalInfo.status} />
+            </Box>
+          )}
+      </Box>
     </Link>
   );
 };
diff --git a/components/Proposals/ProposalsList/ProposalStateDate.tsx b/components/Proposals/ProposalsList/ProposalStateDate.tsx
index bcc26ed5..7d9a0dc4 100644
--- a/components/Proposals/ProposalsList/ProposalStateDate.tsx
+++ b/components/Proposals/ProposalsList/ProposalStateDate.tsx
@@ -1,24 +1,22 @@
-import type { ProposalData } from "@tribecahq/tribeca-sdk";
-import { ProposalState } from "@tribecahq/tribeca-sdk";
-import type BN from "bn.js";
-import Countdown from "react-countdown";
+import type { ProposalData } from '@tribecahq/tribeca-sdk';
+import { ProposalState } from '@tribecahq/tribeca-sdk';
+import type BN from 'bn.js';
+import Countdown from 'react-countdown';
 
-import type {
-  ProposalInfo,
-  ProposalStatus,
-} from "../../../../../../hooks/tribeca/useProposals";
+import type { ProposalInfo, ProposalStatus } from 'hooks/tribeca/useProposals';
+import { Text } from 'degen';
 
 interface Props {
   proposalInfo: ProposalInfo;
 }
 
 const STATE_LABELS: { [K in ProposalState]: string } = {
-  [ProposalState.Active]: "Voting ends",
-  [ProposalState.Draft]: "Created",
-  [ProposalState.Canceled]: "Canceled",
-  [ProposalState.Defeated]: "Failed",
-  [ProposalState.Succeeded]: "Passed",
-  [ProposalState.Queued]: "Queued",
+  [ProposalState.Active]: 'Voting ends',
+  [ProposalState.Draft]: 'Created',
+  [ProposalState.Canceled]: 'Canceled',
+  [ProposalState.Defeated]: 'Failed',
+  [ProposalState.Succeeded]: 'Passed',
+  [ProposalState.Queued]: 'Queued'
 };
 
 export const stateToDateSeconds = (
@@ -50,23 +48,23 @@ export const ProposalStateDate: React.FC<Props> = ({ proposalInfo }: Props) => {
   const dateSeconds = stateToDateSeconds(proposalData, status);
   const date = dateSeconds ? new Date(dateSeconds.toNumber() * 1_000) : null;
   return (
-    <span>
-      {executed ? "Executed" : STATE_LABELS[state]}{" "}
+    <Text as="span">
+      {executed ? 'Executed' : STATE_LABELS[state]}{' '}
       {state === ProposalState.Active ? (
         date ? (
           <>
             in <Countdown date={date} />
           </>
         ) : (
-          "--"
+          '--'
         )
       ) : (
         date?.toLocaleDateString(undefined, {
-          month: "long",
-          day: "numeric",
-          year: "numeric",
+          month: 'long',
+          day: 'numeric',
+          year: 'numeric'
         })
       )}
-    </span>
+    </Text>
   );
 };
diff --git a/components/Proposals/ProposalsList/ProposalStateLabel.tsx b/components/Proposals/ProposalsList/ProposalStateLabel.tsx
index 6be607f9..dbea0f39 100644
--- a/components/Proposals/ProposalsList/ProposalStateLabel.tsx
+++ b/components/Proposals/ProposalsList/ProposalStateLabel.tsx
@@ -1,5 +1,5 @@
 import { ProposalState } from '@tribecahq/tribeca-sdk';
-import { Text } from 'degen';
+import { Box, BoxProps, Text } from 'degen';
 import { startCase } from 'lodash';
 
 interface Props {
@@ -20,24 +20,35 @@ export const ProposalStateLabel: React.FC<Props> = ({
   state,
   executed
 }: Props) => {
+  let borderColor: BoxProps['color'] = 'inherit';
+  let textColor: BoxProps['color'] = 'inherit';
+  if (
+    state === ProposalState.Canceled ||
+    state === ProposalState.Defeated ||
+    state === ProposalState.Draft
+  ) {
+    borderColor = 'text';
+    textColor = 'text';
+  }
+  if (
+    executed ||
+    state === ProposalState.Succeeded ||
+    state === ProposalState.Queued
+  ) {
+    borderColor = 'green';
+    textColor = 'green';
+  }
   return (
-    <Text
-      size="small"
-      align="center"
-      // css={[
-      //   tw`text-xs border rounded py-0.5 w-16 flex items-center justify-center`,
-      //   (state === ProposalState.Canceled ||
-      //     state === ProposalState.Defeated ||
-      //     state === ProposalState.Draft) &&
-      //     tw`border-gray-500 text-gray-500`,
-      //   (executed ||
-      //     state === ProposalState.Succeeded ||
-      //     state === ProposalState.Queued) &&
-      //     tw`border-primary text-primary`,
-      //   state === ProposalState.Active && tw`border-accent text-accent`
-      // ]}
+    <Box
+      borderWidth="px"
+      borderRadius="medium"
+      paddingY="0.5"
+      width="16"
+      borderColor={borderColor}
     >
-      {startCase(executed ? 'executed' : STATE_LABELS[state])}
-    </Text>
+      <Text size="small" align="center" color={textColor}>
+        {startCase(executed ? 'executed' : STATE_LABELS[state])}
+      </Text>
+    </Box>
   );
 };
diff --git a/components/HelperCard.tsx b/components/common/HelperCard.tsx
similarity index 100%
rename from components/HelperCard.tsx
rename to components/common/HelperCard.tsx
diff --git a/components/common/governance/Card.tsx b/components/common/governance/Card.tsx
new file mode 100644
index 00000000..7516c03c
--- /dev/null
+++ b/components/common/governance/Card.tsx
@@ -0,0 +1,108 @@
+import { Box, Text } from 'degen';
+import Link from 'next/link';
+
+import { HelperCard } from '../HelperCard';
+
+interface Props {
+  className?: string;
+  title?: React.ReactNode;
+  titleStyles?: React.CSSProperties;
+  children?: React.ReactNode;
+  link?: {
+    title: string;
+    href?: string;
+  };
+  /**
+   * Whether or not to add padding to the card's body.
+   */
+  padded?: boolean;
+  bodyScrollX?: boolean;
+}
+
+export const Card: React.FC<Props> = ({
+  className,
+  title,
+  titleStyles,
+  children,
+  link,
+  padded = false,
+  bodyScrollX = false
+}: Props) => {
+  return (
+    <Box
+      borderRadius="medium"
+      backgroundColor="black"
+      boxShadow="0.5"
+      display="flex"
+      flexDirection="column"
+      className={className}
+      // tw="rounded bg-warmGray-850 shadow-xl flex flex-col"
+    >
+      {title && (
+        <Box
+          width="full"
+          height="16"
+          display="flex"
+          alignItems="center"
+          paddingX="7"
+          fontWeight="bold"
+          color="white"
+          // tw="h-16 flex items-center px-7 w-full text-white font-bold tracking-tight border-b border-warmGray-800"
+          // style={titleStyles}
+        >
+          {typeof title === 'string' ? <Text as="h2">{title}</Text> : title}
+        </Box>
+      )}
+      {/* <ErrorBoundary
+        fallback={
+          <div tw="py-7 px-4">
+            <HelperCard variant="error">
+              An unexpected error occurred.
+            </HelperCard>
+          </div>
+        }
+      > */}
+      <Box
+        {...(padded && { paddingX: '7', paddingY: '4' })}
+        {...(bodyScrollX && { overflow: 'auto' })}
+        // css={[padded && tw`px-7 py-4`, bodyScrollX && tw`overflow-x-auto`]}
+      >
+        {children}
+      </Box>
+      {/* </ErrorBoundary> */}
+      {link &&
+        (link.href ? (
+          <Box
+            as={Link}
+            href={link.href}
+            color={{ base: 'white', hover: 'textPrimary' }}
+          >
+            <Box
+              display="flex"
+              alignItems="center"
+              justifyContent="center"
+              paddingY="5"
+              fontSize="small"
+              fontWeight="bold"
+              textTransform="uppercase"
+              // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800"
+            >
+              {link.title}
+            </Box>
+          </Box>
+        ) : (
+          <Box
+            display="flex"
+            alignItems="center"
+            justifyContent="center"
+            paddingY="5"
+            fontSize="small"
+            fontWeight="bold"
+            // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800 text-warmGray-600 cursor-not-allowed"
+          >
+            {link.title}
+          </Box>
+        ))}
+    </Box>
+  );
+};
diff --git a/components/common/governance/GovernancePage.tsx b/components/common/governance/GovernancePage.tsx
new file mode 100644
index 00000000..f5ce329b
--- /dev/null
+++ b/components/common/governance/GovernancePage.tsx
@@ -0,0 +1,35 @@
+import {
+  useGovernor
+  // useGovernorInfo,
+} from 'hooks/tribeca/useGovernor';
+// import { GovernanceNotFoundPage } from '../../pages/governance/GovernanceNotFoundPage';
+// import { LoadingPage } from '../LoadingPage';
+import { GovernancePageInner } from './GovernancePageInner';
+
+interface Props {
+  title: React.ReactNode;
+  header?: React.ReactNode;
+  right?: React.ReactNode;
+  preContent?: React.ReactNode;
+  children?: React.ReactNode;
+  contentStyles?: React.CSSProperties;
+  containerStyles?: React.CSSProperties;
+  hideDAOName?: boolean;
+  backLink?: {
+    label: string;
+    href: string;
+  };
+}
+
+export const GovernancePage: React.FC<Props> = ({ ...props }: Props) => {
+  // const info = useGovernorInfo();
+  const { governorData } = useGovernor();
+  if (governorData === null) {
+    return <div>Not found</div>;
+    // return <GovernanceNotFoundPage />;
+  }
+  // if (info?.loading) {
+  //   return <LoadingPage />;
+  // }
+  return <GovernancePageInner {...props} />;
+};
diff --git a/components/common/governance/GovernancePageInner.tsx b/components/common/governance/GovernancePageInner.tsx
new file mode 100644
index 00000000..d047d1da
--- /dev/null
+++ b/components/common/governance/GovernancePageInner.tsx
@@ -0,0 +1,136 @@
+import Link from 'next/link';
+
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+// import { ImageWithFallback } from '../ImageWithFallback';
+import { Box, IconChevronLeft, Text } from 'degen';
+
+interface Props {
+  title: React.ReactNode;
+  header?: React.ReactNode;
+  right?: React.ReactNode;
+  preContent?: React.ReactNode;
+  children?: React.ReactNode;
+  contentStyles?: React.CSSProperties;
+  containerStyles?: React.CSSProperties;
+  hideDAOName?: boolean;
+  backLink?: {
+    label: string;
+    href: string;
+  };
+}
+
+export const GovernancePageInner: React.FC<Props> = ({
+  title,
+  header,
+  right,
+  preContent,
+  children,
+  contentStyles,
+  containerStyles,
+  hideDAOName = false,
+  backLink
+}: Props) => {
+  // const { daoName, iconURL } = useGovernor();
+  return (
+    <Box width="full">
+      <Box paddingBottom="24">
+        <Box
+          height="6"
+          width="3/4"
+          maxWidth="screenLg"
+          marginBottom="4"
+          // tw="h-6 mx-auto w-11/12 max-w-7xl mb-4"
+        >
+          {!hideDAOName && (
+            <Box
+              display="flex"
+              alignItems="center"
+              gap="2"
+              fontSize="small"
+              fontWeight="semiBold"
+              color="white"
+            >
+              {/* <ImageWithFallback
+                src={iconURL}
+                size={24}
+                alt={`Icon for ${daoName ?? 'DAO'}`}
+              />
+              <span>{daoName} Governance</span> */}
+            </Box>
+          )}
+        </Box>
+        <Box style={containerStyles}>
+          <Box
+            width="full"
+            display="flex"
+            flexDirection={{ md: 'row', lg: 'column' }}
+            alignItems="center"
+            justifyContent="space-between"
+            gap={{ md: '8', lg: '4' }}
+            flexWrap="wrap"
+            // tw="flex flex-col gap-4 md:(gap-8 flex-row min-h-[120px]) flex-wrap items-center justify-between w-full"
+          >
+            <Box
+              display="flex"
+              flexDirection="column"
+              alignSelf={{ md: 'center', lg: 'flex-start' }}
+              // tw="flex flex-col self-start md:self-center"
+            >
+              {backLink && (
+                <Box
+                  as={Link}
+                  marginBottom="7"
+                  display="flex"
+                  alignItems="center"
+                  gap="2"
+                  fontWeight="bold"
+                  color={{ hover: 'white' }}
+                >
+                  <IconChevronLeft size="5" />
+                  <Text
+                    as="span"
+                    size="small"
+                    // tw="leading-none text-sm tracking-tighter"
+                  >
+                    {backLink.label}
+                  </Text>
+                </Box>
+              )}
+              {typeof title === 'string' ? (
+                <Text
+                  as="h1"
+                  size="headingOne"
+                  weight="bold"
+                  color="white"
+                  // tw="text-2xl md:text-3xl font-bold text-white tracking-tighter"
+                >
+                  {title}
+                </Text>
+              ) : (
+                title
+              )}
+              {header}
+            </Box>
+            {right && <div>{right}</div>}
+          </Box>
+          {preContent && <Box marginTop="8">{preContent}</Box>}
+        </Box>
+      </Box>
+      <Box style={containerStyles}>
+        <Box
+          as="main"
+          width="full"
+          marginTop="-4"
+          marginBottom="20"
+          style={contentStyles}
+        >
+          {children}
+        </Box>
+      </Box>
+    </Box>
+  );
+};
+
+// export const Box wid = styled.div(
+//   () => tw`max-w-5xl w-full md:w-11/12 mx-auto`
+// );
diff --git a/components/common/governance/Meter.tsx b/components/common/governance/Meter.tsx
new file mode 100644
index 00000000..d393f8ba
--- /dev/null
+++ b/components/common/governance/Meter.tsx
@@ -0,0 +1,42 @@
+import { Box } from 'degen';
+import { Fraction } from '@saberhq/token-utils';
+import type BN from 'bn.js';
+
+interface Props {
+  value: BN | number;
+  max: BN | number;
+  barColor: string;
+  className?: string;
+}
+
+export const Meter: React.FC<Props> = ({
+  value,
+  max,
+  barColor,
+  className
+}: Props) => {
+  const width =
+    typeof value === 'number' && typeof max === 'number'
+      ? value / max
+      : new Fraction(value, max).asNumber;
+  return (
+    <Box
+      className={className}
+      flexGrow={1}
+      backgroundColor="accent"
+      height="1"
+      borderRadius="medium"
+    >
+      <Box
+        style={{
+          width: `${Math.min(width, 1) * 100}%`,
+          backgroundColor: barColor
+        }}
+        height="1"
+        borderRadius="medium"
+        backgroundColor="backgroundSecondary"
+        // tw="bg-primary h-1 rounded transition-all"
+      />
+    </Box>
+  );
+};
diff --git a/components/common/governance/Profile.tsx b/components/common/governance/Profile.tsx
new file mode 100644
index 00000000..f2f2f75d
--- /dev/null
+++ b/components/common/governance/Profile.tsx
@@ -0,0 +1,86 @@
+import { useWalletIdentity } from '@cardinal/namespaces-components';
+import { useConnectedWallet, useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import makeBlockie from 'ethereum-blockies-base64';
+import { FaExclamationTriangle, FaTwitter } from 'react-icons/fa';
+import { Link } from 'react-router-dom';
+
+import { useAddressImage } from '../../../hooks/cardinal/useAddressImage';
+import { useCardinalDisplayName } from '../../../hooks/cardinal/useAddressName';
+import { AddressLink } from '../AddressLink';
+import { ContentLoader } from '../ContentLoader';
+import { MouseoverTooltip } from '../MouseoverTooltip';
+
+interface Props {
+  address: PublicKey;
+  href?: string;
+}
+
+export const Profile: React.FC<Props> = ({ address, href }: Props) => {
+  const { network, connection } = useSolana();
+  const wallet = useConnectedWallet();
+  const { name, displayName } = useCardinalDisplayName(address);
+  const { addressImage, loadingImage } = useAddressImage(address);
+  const { show } = useWalletIdentity();
+  const image = (
+    <img
+      tw="h-10 w-10 rounded-full"
+      alt={`Profile of ${displayName ?? address.toString()}`}
+      src={addressImage ?? makeBlockie(address.toString())}
+    />
+  );
+  return (
+    <div tw="text-sm">
+      <div tw="flex gap-2 items-center">
+        <div tw="h-10 w-10 rounded-full flex">
+          {loadingImage ? (
+            <ContentLoader tw="h-10 w-10 rounded-full" />
+          ) : href ? (
+            <Link to={href}>{image}</Link>
+          ) : (
+            image
+          )}
+        </div>
+        <div tw="flex flex-col leading-normal">
+          <div tw="flex gap-1 items-center">
+            <div tw="h-5 flex items-center">
+              {displayName === undefined ? (
+                <ContentLoader tw="h-4 w-12 rounded" />
+              ) : (
+                <span
+                  css={[
+                    name ? tw`text-white` : tw`text-warmGray-400`,
+                    tw`font-medium`
+                  ]}
+                >
+                  {displayName}
+                </span>
+              )}
+            </div>
+            {name?.startsWith('@') && (
+              <a
+                href={`https://twitter.com/${name.slice(1)}`}
+                target="_blank"
+                rel="noreferrer"
+              >
+                <FaTwitter
+                  css={css`
+                    color: #1da1f2;
+                  `}
+                />
+              </a>
+            )}
+            {name === null && wallet && wallet.publicKey.equals(address) && (
+              <MouseoverTooltip text="Your profile is not verified. Please link your Twitter.">
+                <button onClick={() => show(wallet, connection, network)}>
+                  <FaExclamationTriangle tw="text-yellow-500" />
+                </button>
+              </MouseoverTooltip>
+            )}
+          </div>
+          <AddressLink tw="text-gray-400" address={address} showCopy />
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/helpers/utils.ts b/helpers/utils.ts
index 78440cd7..e646cc3a 100644
--- a/helpers/utils.ts
+++ b/helpers/utils.ts
@@ -18,6 +18,9 @@ import * as anchor from '@project-serum/anchor';
 import type { Network } from '@saberhq/solana-contrib';
 import type { Cluster, TransactionInstruction } from '@solana/web3.js';
 import { TokenInfo } from '@saberhq/token-utils';
+import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { SmartWalletTransactionData } from '@gokiprotocol/client';
+import BN from 'bn.js';
 
 export const convertArrayToObject = (array: any[], key: string) => {
   const initialValue = {};
@@ -356,6 +359,17 @@ export function shortenAddress(address: string, chars = 5): string {
   )}`;
 }
 
+/**
+ * Converts a Solana timestamp to a Date.
+ *
+ * @param num
+ * @returns
+ */
+export const tsToDate = (num: BN): Date => new Date(num.toNumber() * 1_000);
+
+export const gokiTXLink = (tx: SmartWalletTransactionData) =>
+  `https://goki.so/#/wallets/${tx.smartWallet.toString()}/tx/${tx.index.toString()}`;
+
 export function addressLabel(
   address: string,
   tokenRegistry?: Map<string, TokenInfo>
@@ -371,3 +385,12 @@ export function addressLabel(
 export function displayAddress(address: string, shorten = true): string {
   return addressLabel(address) ?? (shorten ? shortenAddress(address) : address);
 }
+
+export const sideColor = (side: VoteSide) =>
+  side === VoteSide.For
+    ? `colors.primary`
+    : side === VoteSide.Against
+    ? `colors.red.500`
+    : side === VoteSide.Abstain
+    ? `colors.yellow.500`
+    : `colors.transparent`;
diff --git a/hooks/tribeca/useEscrow.ts b/hooks/tribeca/useEscrow.ts
index a92b87b8..0b935d6d 100644
--- a/hooks/tribeca/useEscrow.ts
+++ b/hooks/tribeca/useEscrow.ts
@@ -48,7 +48,7 @@ export const useEscrow = (owner?: PublicKey) => {
       const escrowW = new VoteEscrow(
         tribecaMut,
         lockerKey,
-        governor,
+        governor!,
         escrow.publicKey,
         owner
       );
diff --git a/hooks/useParsedTX.ts b/hooks/useParsedTX.ts
new file mode 100644
index 00000000..1546ee0b
--- /dev/null
+++ b/hooks/useParsedTX.ts
@@ -0,0 +1,85 @@
+import { SuperCoder } from '@saberhq/anchor-contrib';
+import { useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import { startCase } from 'lodash';
+import { useEffect } from 'react';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import { parseNonAnchorInstruction } from 'helpers/instructions/parseNonAnchorInstruction';
+import { useGokiTransactionData } from 'helpers/parser';
+import { displayAddress, programLabel } from 'helpers/utils';
+import { useIDLs } from './useIDLs';
+import type { ParsedInstruction } from './useSmartWallet';
+import { useTXAddress } from './useTXAddress';
+
+export const useParsedTX = (smartWalletKey: PublicKey, index: number) => {
+  const { data: key } = useTXAddress(smartWalletKey, index);
+  return useParsedTXByKey(key);
+};
+
+export const useParsedTXByKey = (key: PublicKey | undefined) => {
+  const { network } = useSolana();
+  const { data: txData, isLoading: loading } = useGokiTransactionData(key);
+  const idls = useIDLs(
+    txData?.account.instructions.map(ix => ix.programId) ?? []
+  );
+
+  const query = useQuery(
+    ['parsedTX', network, key],
+    () => {
+      invariant(txData);
+      const instructions: ParsedInstruction[] = txData.account.instructions
+        .map(rawIx => ({
+          ...rawIx,
+          data: Buffer.from(rawIx.data)
+        }))
+        .map((ix): Omit<ParsedInstruction, 'title'> => {
+          const idl = idls.find(theIDL =>
+            theIDL.data?.programID.equals(ix.programId)
+          )?.data?.idl;
+          const label = programLabel(ix.programId.toString());
+          if (idl) {
+            const superCoder = new SuperCoder(ix.programId, {
+              ...idl,
+              instructions: idl.instructions.concat(idl.state?.methods ?? [])
+            });
+            return {
+              programName: label ?? startCase(idl.name),
+              ix,
+              parsed: { ...superCoder.parseInstruction(ix), anchor: true }
+            };
+          }
+          const parsedNonAnchor = parseNonAnchorInstruction(ix);
+          return { ix, programName: label, parsed: parsedNonAnchor };
+        })
+        .map(
+          (ix): ParsedInstruction => ({
+            ...ix,
+            title: `${
+              ix.programName ?? displayAddress(ix.ix.programId.toString())
+            }: ${startCase(
+              (ix.parsed && 'name' in ix.parsed ? ix.parsed.name : null) ??
+                'Unknown Instruction'
+            )}`
+          })
+        );
+      return {
+        tx: txData,
+        index: txData.account.index.toNumber(),
+        instructions
+      };
+    },
+    {
+      enabled: !!txData
+    }
+  );
+
+  useEffect(() => {
+    if (txData && !query.isFetching) {
+      void query.refetch();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [txData]);
+  return { ...query, isLoading: query.isLoading || loading };
+};
diff --git a/hooks/useSmartWallet.ts b/hooks/useSmartWallet.ts
new file mode 100644
index 00000000..db506815
--- /dev/null
+++ b/hooks/useSmartWallet.ts
@@ -0,0 +1,209 @@
+import type {
+  SmartWalletData,
+  SmartWalletTransactionData,
+  SmartWalletTypes,
+  SmartWalletWrapper
+} from '@gokiprotocol/client';
+import {
+  findTransactionAddress,
+  GOKI_ADDRESSES,
+  SmartWalletJSON
+} from '@gokiprotocol/client';
+import type { InstructionParsed } from '@saberhq/anchor-contrib';
+import { SuperCoder } from '@saberhq/anchor-contrib';
+import type { ProgramAccount } from '@saberhq/token-utils';
+import type { TransactionInstruction } from '@solana/web3.js';
+import { PublicKey } from '@solana/web3.js';
+import { startCase, uniq } from 'lodash';
+import { useEffect, useMemo, useState } from 'react';
+import { createContainer } from 'unstated-next';
+
+import { useSDK } from 'helpers/sdk';
+import type { ParsedNonAnchorInstruction } from 'helpers/instructions/parseNonAnchorInstruction';
+import {
+  InstructionParseError,
+  parseNonAnchorInstruction
+} from 'helpers/instructions/parseNonAnchorInstruction';
+import {
+  useBatchedGokiTransactions,
+  useGokiSmartWalletData
+} from 'helpers/parser';
+import { displayAddress, programLabel } from 'helpers/utils';
+import { useIDLs } from './useIDLs';
+
+export const SMART_WALLET_CODER = new SuperCoder<SmartWalletTypes>(
+  GOKI_ADDRESSES.SmartWallet,
+  SmartWalletJSON
+);
+
+export interface ParsedInstruction {
+  ix: TransactionInstruction;
+  parsed?:
+    | ParsedNonAnchorInstruction
+    | ({ anchor: true } & InstructionParsed)
+    | { error: InstructionParseError }
+    | null;
+  programName?: string;
+  title: string;
+}
+
+export interface ParsedTX {
+  tx: ProgramAccount<SmartWalletTransactionData>;
+  index: number;
+  instructions: ParsedInstruction[];
+}
+
+const useSmartWalletInner = (
+  key?: PublicKey
+): {
+  key: PublicKey;
+  smartWallet: SmartWalletWrapper | null;
+  smartWalletData?: ProgramAccount<SmartWalletData> | null;
+  parsedTXs?: ParsedTX[];
+  threshold?: number;
+  path: string;
+} => {
+  if (!key) {
+    throw new Error('missing key');
+  }
+  const { sdkMut } = useSDK();
+
+  const { data: smartWalletData } = useGokiSmartWalletData(key);
+  const [smartWallet, setSmartWallet] = useState<SmartWalletWrapper | null>(
+    null
+  );
+
+  const [txAddrs, setTxAddrs] = useState<PublicKey[]>([]);
+  const { data: txs } = useBatchedGokiTransactions(txAddrs);
+
+  useEffect(() => {
+    if (!smartWalletData) {
+      setTxAddrs([]);
+      return;
+    }
+    void (async () => {
+      const numTransactions =
+        smartWalletData.account.numTransactions.toNumber();
+      if (numTransactions) {
+        const txAddrs = await Promise.all(
+          Array(numTransactions)
+            .fill(null)
+            .map(async (_, i) => {
+              const [key] = await findTransactionAddress(
+                smartWalletData.publicKey,
+                i
+              );
+              return key;
+            })
+        );
+        setTxAddrs(txAddrs);
+      }
+    })();
+  }, [key, smartWalletData]);
+
+  useEffect(() => {
+    if (!sdkMut) {
+      setSmartWallet(null);
+      return;
+    }
+    void (async () => {
+      const sw = await sdkMut.loadSmartWallet(key);
+      setSmartWallet(sw);
+    })();
+  }, [key, sdkMut]);
+
+  const programIDsToFetch = useMemo(
+    () =>
+      uniq(
+        txs
+          ?.flatMap(tx =>
+            tx?.account.instructions.map(ix => ix.programId.toString())
+          )
+          .filter((x): x is string => !!x)
+      ),
+    [txs]
+  );
+
+  const idls = useIDLs(programIDsToFetch.map(p => new PublicKey(p)));
+
+  const parsedTXs = useMemo(() => {
+    return txs
+      ?.filter((tx): tx is ProgramAccount<SmartWalletTransactionData> => !!tx)
+      .map((tx): ParsedTX => {
+        const index = tx.account.index.toNumber();
+        const instructions: ParsedInstruction[] = tx.account.instructions
+          .map(rawIx => ({
+            ...rawIx,
+            data: Buffer.from(rawIx.data)
+          }))
+          .map((ix): Omit<ParsedInstruction, 'title'> => {
+            const idlIndex = programIDsToFetch.findIndex(
+              pid => pid === ix.programId.toString()
+            );
+            const idl = idls[idlIndex]?.data?.idl;
+            const label = programLabel(ix.programId.toString());
+            if (idl) {
+              const superCoder = new SuperCoder(ix.programId, {
+                ...idl,
+                instructions: idl.instructions.concat(idl.state?.methods ?? [])
+              });
+
+              const common = {
+                programName: label ?? startCase(idl.name),
+                ix
+              };
+
+              try {
+                const ixParsed = superCoder.parseInstruction(ix);
+                return {
+                  ...common,
+                  parsed: {
+                    ...ixParsed,
+                    anchor: true
+                  }
+                };
+              } catch (e) {
+                return {
+                  ...common,
+                  parsed: { error: new InstructionParseError(ix, e) }
+                };
+              }
+            }
+            const parsedNonAnchor = parseNonAnchorInstruction(ix);
+            return { ix, programName: label, parsed: parsedNonAnchor };
+          })
+          .map(
+            (ix): ParsedInstruction => ({
+              ...ix,
+              title: `${
+                ix.programName ?? displayAddress(ix.ix.programId.toString())
+              }: ${startCase(
+                (ix.parsed && 'name' in ix.parsed ? ix.parsed.name : null) ??
+                  'Unknown Instruction'
+              )}`
+            })
+          );
+        return { tx, index, instructions };
+      })
+      .sort((a, b) => {
+        const aIndex = a.index;
+        const bIndex = b.index;
+        if (aIndex !== undefined && bIndex !== undefined) {
+          return aIndex < bIndex ? 1 : -1;
+        }
+        if (aIndex !== undefined && bIndex === undefined) {
+          return -1;
+        }
+        return 1;
+      });
+  }, [idls, programIDsToFetch, txs]);
+
+  const threshold = smartWalletData?.account.threshold.toNumber();
+
+  const path = `/wallets/${key.toString()}`;
+
+  return { key, smartWallet, smartWalletData, parsedTXs, threshold, path };
+};
+
+export const { useContainer: useSmartWallet, Provider: SmartWalletProvider } =
+  createContainer(useSmartWalletInner);
diff --git a/hooks/useTXAddress.ts b/hooks/useTXAddress.ts
new file mode 100644
index 00000000..23c72c03
--- /dev/null
+++ b/hooks/useTXAddress.ts
@@ -0,0 +1,13 @@
+import { findTransactionAddress } from '@gokiprotocol/client';
+import type { PublicKey } from '@solana/web3.js';
+import { useQuery } from 'react-query';
+
+export const useTXAddress = (smartWalletKey: PublicKey, index: number) => {
+  return useQuery(
+    ['parsedTXAddress', smartWalletKey.toString(), index],
+    async () => {
+      const [txKey] = await findTransactionAddress(smartWalletKey, index);
+      return txKey;
+    }
+  );
+};
diff --git a/pages/governance/proposals/[proposalIndex]/index.tsx b/pages/governance/proposals/[proposalIndex]/index.tsx
new file mode 100644
index 00000000..9fb5837a
--- /dev/null
+++ b/pages/governance/proposals/[proposalIndex]/index.tsx
@@ -0,0 +1,13 @@
+import { NextPage } from 'next';
+import Layout from 'components/Layout/Layout';
+import { ProposalIndexView } from 'components/Proposals/ProposalIndexView';
+
+const Proposals: NextPage = () => {
+  return (
+    <Layout>
+      <ProposalIndexView />
+    </Layout>
+  );
+};
+
+export default Proposals;
diff --git a/pages/governance/proposals/index.tsx b/pages/governance/proposals/index.tsx
index da5ce804..75d4ec65 100644
--- a/pages/governance/proposals/index.tsx
+++ b/pages/governance/proposals/index.tsx
@@ -4,7 +4,7 @@ import { ProposalsList } from 'components/Proposals/ProposalsList';
 import Layout from 'components/Layout/Layout';
 
 const Proposals: NextPage = () => {
-  const [showDrafts, setShowDrafts] = useState(false);
+  const [showDrafts, setShowDrafts] = useState(true);
 
   return (
     <Layout>

From 802c7e8d472f1bdf0a36097469d52e99650c6034 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 17 May 2022 04:33:22 -0500
Subject: [PATCH 036/101] solved merge conflicts with dev (2)

---
 components/HoneyModal/HoneyModal.tsx          |  6 ++--
 components/PHoneyModal/PHoneyModal.tsx        |  6 ++--
 .../locked-voter/actions/ProposalActivate.tsx |  2 +-
 components/Proposals/ProposalsList/index.tsx  |  2 +-
 components/VeHoneyModal/VeHoneyModal.tsx      |  4 +--
 hooks/tribeca/useEscrow.ts                    |  7 ++++-
 hooks/useStake.tsx                            | 14 ++++++---
 pages/_app.tsx                                | 30 +++++++++++--------
 pages/governance/index.tsx                    | 29 +++---------------
 9 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/components/HoneyModal/HoneyModal.tsx b/components/HoneyModal/HoneyModal.tsx
index 82266097..69abd2f0 100644
--- a/components/HoneyModal/HoneyModal.tsx
+++ b/components/HoneyModal/HoneyModal.tsx
@@ -38,11 +38,11 @@ const HoneyModal = () => {
   // ======================== Should replace with configuration ================
   const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
   const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_STAKE_POOL_ADDR ||
+    process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
       '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
   );
   const LOCKER_ADDRESS = new PublicKey(
-    process.env.NEXT_LOCKER_ADDR ||
+    process.env.NEXT_PUBLIC_LOCKER_ADDR ||
       '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
   );
   // ============================================================================
@@ -139,7 +139,7 @@ const HoneyModal = () => {
                   onChange={event =>
                     setVestingPeriod(Number(event.target.value))
                   }
-                > 
+                >
                   <option value="1">1 month</option>
                   <option value="3">3 months</option>
                   <option value="6">6 months</option>
diff --git a/components/PHoneyModal/PHoneyModal.tsx b/components/PHoneyModal/PHoneyModal.tsx
index 3db70d92..449c88fe 100644
--- a/components/PHoneyModal/PHoneyModal.tsx
+++ b/components/PHoneyModal/PHoneyModal.tsx
@@ -6,7 +6,7 @@ import { useAccounts } from 'hooks/useAccounts';
 import { PHONEY_DECIMALS, PHONEY_MINT } from 'helpers/sdk/constant';
 import { convert, convertToBN } from 'helpers/utils';
 
-// console.log("The stake pool address is : ", process.env.PUBLIC_NEXT_STAKE_POOL_ADDRESS)
+// console.log("The stake pool address is : ", process.env.PUBLIC_NEXT_PUBLIC_STAKE_POOL_ADDRESS)
 const PHoneyModal = () => {
   const [amount, setAmount] = useState<number>(0);
   const [isClaimable, setIsClaimable] = useState<boolean>(false);
@@ -22,11 +22,11 @@ const PHoneyModal = () => {
   // ======================== Should replace with configuration ================
   const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
   const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_STAKE_POOL_ADDR ||
+    process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
       '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
   );
   const LOCKER_ADDRESS = new PublicKey(
-    process.env.NEXT_LOCKER_ADDR ||
+    process.env.NEXT_PUBLIC_LOCKER_ADDR ||
       '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
   );
   // ============================================================================
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
index 3f5a70e2..3e2df3c7 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
@@ -103,7 +103,7 @@ export const ProposalActivate: React.FC<Props> = ({
             </Button>
           </Box>
         ) : (
-          <Box display="flex" flexDirection="column" gap="4">
+          <Box display="flex" flexDirection="column" gap="4" width="full">
             <Text as="p">
               You must have at least{' '}
               <strong>{minActivationThreshold?.formatUnits()}</strong> to
diff --git a/components/Proposals/ProposalsList/index.tsx b/components/Proposals/ProposalsList/index.tsx
index cb31f7c0..3f3db7dc 100644
--- a/components/Proposals/ProposalsList/index.tsx
+++ b/components/Proposals/ProposalsList/index.tsx
@@ -101,7 +101,7 @@ export const ProposalsList: React.FC<Props> = ({
       <div>
         <EmptyState title="There aren't any proposals yet.">
           <Text>
-            <Link href={`proposals/create`} passHref>
+            <Link href={'/governance/proposals/create'} passHref>
               Create a proposal
             </Link>
           </Text>
diff --git a/components/VeHoneyModal/VeHoneyModal.tsx b/components/VeHoneyModal/VeHoneyModal.tsx
index 4bf0ec30..8b3f6c14 100644
--- a/components/VeHoneyModal/VeHoneyModal.tsx
+++ b/components/VeHoneyModal/VeHoneyModal.tsx
@@ -55,11 +55,11 @@ const VeHoneyModal = () => {
   // ======================== Should replace with configuration ================
   const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
   const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_STAKE_POOL_ADDR ||
+    process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
       '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
   );
   const LOCKER_ADDRESS = new PublicKey(
-    process.env.NEXT_LOCKER_ADDR ||
+    process.env.NEXT_PUBLIC_LOCKER_ADDR ||
       '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
   );
   // ============================================================================
diff --git a/hooks/tribeca/useEscrow.ts b/hooks/tribeca/useEscrow.ts
index 0b935d6d..0eeb9e6b 100644
--- a/hooks/tribeca/useEscrow.ts
+++ b/hooks/tribeca/useEscrow.ts
@@ -37,10 +37,15 @@ export const useEscrow = (owner?: PublicKey) => {
       enabled: !!(lockerKey && owner)
     }
   );
-  const { data: escrow, isLoading: isEscrowLoading } = useEscrowData(escrowKey);
 
+  const {
+    data: escrow,
+    isLoading: isEscrowLoading,
+    ...rest
+  } = useEscrowData(escrowKey);
   const canLoadEscrow =
     !!governorData && !!(lockerKey && owner && tribecaMut && escrow);
+  console.log(canLoadEscrow, rest);
   const result = useQuery(
     ['escrow', escrow?.publicKey.toString()],
     async () => {
diff --git a/hooks/useStake.tsx b/hooks/useStake.tsx
index e933c404..03e4c66f 100644
--- a/hooks/useStake.tsx
+++ b/hooks/useStake.tsx
@@ -70,10 +70,10 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
         const [userKey] = await sc.getUserPDA(stakePool);
         // console.log('user key: ', userKey.toString());
         const user = await sc.fetchPoolUser(userKey);
-        const lockerAcc = await vc.fetchLocker(locker);
+        const lockerAcc = await vc.fetchLockerV2(locker);
         const [escrowKey] = await vc.getEscrowPDA(locker);
         // console.log('escrow: ', escrowKey.toString());
-        const escrow = await vc.fetchEscrow(escrowKey);
+        const escrow = await vc.fetchEscrowV2(escrowKey);
 
         setPool(pool);
         setUserKey(userKey);
@@ -197,7 +197,13 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
       if (sc && vc && userKey && honeyToken) {
         setIsLoading(true);
         try {
-          await vc.lock(locker, honeyToken.pubkey, amount, duration, hasEscrow);
+          await vc.lockV2(
+            locker,
+            honeyToken.pubkey,
+            amount,
+            duration,
+            hasEscrow
+          );
           toast.success('HONEY successfully vested');
           setIsLoading(false);
         } catch (e) {
@@ -215,7 +221,7 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
     if (vc) {
       setIsLoading(true);
       try {
-        await vc.unlockEscrow(locker, escrowKey, honeyToken?.pubkey);
+        await vc.unlockEscrowV2(locker, escrowKey, honeyToken?.pubkey);
         setIsLoading(false);
       } catch (e) {
         console.log(e);
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 4bf4adab..7780a1b1 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -10,8 +10,7 @@ import { ThemeProvider } from 'degen';
 import { ToastContainer } from 'react-toastify';
 import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
 import SecPopup from 'components/SecPopup';
-import Script from 'next/script';
-import { GOVERNOR_ADDRESS, SDKProvider } from 'helpers/sdk';
+import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
 
 import 'degen/styles';
 import '../styles/globals.css';
@@ -77,17 +76,22 @@ function MyApp({ Component, pageProps }: AppProps) {
         >
           <SailProvider>
             <SDKProvider>
-              <GovernorProvider initialState={{ governor: GOVERNOR_ADDRESS }}>
-              {/* {children} */}
-              {showPopup ? (
-                <SecPopup setShowPopup={setShowPopup} />
-              ) : (
-                <>
-                  <Component {...pageProps} />
-                  <ToastContainer theme="dark" position="bottom-right" />
-                </>
-              )}
-             </GovernorProvider>
+              <GovernorProvider
+                initialState={{
+                  governor: GOVERNOR_ADDRESS,
+                  govToken: HONEY_MINT
+                }}
+              >
+                {/* {children} */}
+                {showPopup ? (
+                  <SecPopup setShowPopup={setShowPopup} />
+                ) : (
+                  <>
+                    <Component {...pageProps} />
+                    <ToastContainer theme="dark" position="bottom-right" />
+                  </>
+                )}
+              </GovernorProvider>
             </SDKProvider>
           </SailProvider>
         </WalletKitProvider>
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 5391c4f7..1ffe401d 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -37,6 +37,7 @@ import {
   calcVeHoneyAmount
 } from 'helpers/utils';
 import { HIPS } from 'constants/hip-links';
+import { ProposalsList } from 'components/Proposals/ProposalsList';
 
 const Governance: NextPage = () => {
   const wallet = useConnectedWallet();
@@ -52,11 +53,11 @@ const Governance: NextPage = () => {
   const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
 
   const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_STAKE_POOL_ADDR ||
+    process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
       'Cv9Hx3VRvqkz5JRPiZM8A2BH31yvpcT4qiUJLdtgu7TE'
   );
   const LOCKER_ADDRESS = new PublicKey(
-    process.env.NEXT_LOCKER_ADDR ||
+    process.env.NEXT_PUBLIC_LOCKER_ADDR ||
       '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
   );
   // ============================================================================
@@ -389,29 +390,7 @@ const Governance: NextPage = () => {
           >
             Recent Proposals
           </Text>
-          <Stack>
-            {HIPS.map(hip => (
-              <Box
-                as="a"
-                href={hip.link}
-                target="blank"
-                cursor="pointer"
-                key={hip.link}
-              >
-                <Card hover padding="5">
-                  <Stack align="center" direction="horizontal">
-                    <Stack flex={1}>
-                      <Text weight="bold" size="large">
-                        {hip.title}
-                      </Text>
-                      <Tag hover>{hip.date}</Tag>
-                    </Stack>
-                    <IconChevronRight color="text" />
-                  </Stack>
-                </Card>
-              </Box>
-            ))}
-          </Stack>
+          <ProposalsList maxCount={3} />
         </Box>
       </Stack>
     </Layout>

From b1d8cc0906388a5c99f3aec1492b9199b6bed7b9 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 17 May 2022 07:41:05 -0500
Subject: [PATCH 037/101] Fix build error

---
 .../locked-voter/ProposalCreateInner.tsx          |  8 +-------
 .../locked-voter/ProposalTXForm.tsx               |  4 ++--
 .../locked-voter/actions/ProposalExecute.tsx      | 15 ++++++---------
 hooks/tribeca/useGovernor.ts                      | 13 +++++++++++++
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
index 9b677e16..dad142a5 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -6,19 +6,13 @@ import {
 } from '@saberhq/sail';
 import { LAMPORTS_PER_SOL, SystemProgram, Transaction } from '@solana/web3.js';
 import ReactMarkdown from 'react-markdown';
+import { Box, Button, Card, Heading, Input, Textarea, Text } from 'degen';
 
 import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
 import { useGovernor } from 'hooks/tribeca/useGovernor';
-// import { AsyncButton } from '../../../../../common/AsyncButton';
-// import { Button } from '../../../../../common/Button';
-// import { Card } from '../../../../../common/governance/Card';
-// import { HelperCard } from '../../../../../common/HelperCard';
-// import { InputText, Textarea } from '../../../../../common/inputs/InputText';
-// import { LabeledInput } from '../../../../../common/inputs/LabeledInput';
 import { ProposalConfirmModal } from './ProposalConfirmationModal';
 import { ProposalTXForm } from './ProposalTXForm';
 import { HelperCard } from 'components/common/HelperCard';
-import { Box, Button, Card, Heading, Input, Textarea, Text } from 'degen';
 import { AsyncButton } from 'components/AsyncButton';
 
 export const ProposalCreateInner: React.FC = () => {
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
index c09d95ce..59853ad8 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
@@ -21,7 +21,7 @@ export const ProposalTXForm: React.FC<Props> = ({
   setTxRaw
 }: Props) => {
   const [actionType, setActionType] = useState<ActionType>('Upgrade Program');
-  const { meta, smartWallet, lockerData, governor } = useGovernor();
+  const { smartWallet, lockerData, governor } = useGovernor();
   const { ownerInvokerKey } = useExecutiveCouncil();
 
   if (!smartWallet || !ownerInvokerKey) {
@@ -29,7 +29,7 @@ export const ProposalTXForm: React.FC<Props> = ({
   }
 
   const actor = smartWallet;
-  const ctx = { ...meta, locker: lockerData?.publicKey, governor };
+  const ctx = { locker: lockerData?.publicKey, governor };
 
   const currentAction = ACTIONS.find(action => action.title === actionType);
 
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
index aed8ce70..f3997069 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
@@ -1,21 +1,18 @@
 import { mapSome, useTXHandlers } from '@saberhq/sail';
-import { TransactionInstruction } from '@solana/web3.js';
 // import pluralize from 'pluralize';
 import Countdown from 'react-countdown';
-import invariant from 'tiny-invariant';
 
-import { useSDK } from 'helpers/sdk';
+// import { useSDK } from 'helpers/sdk';
 import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
-import { useGovernor } from 'hooks/tribeca/useGovernor';
+// import { useGovernor } from 'hooks/tribeca/useGovernor';
 import type { ProposalInfo } from 'hooks/tribeca/useProposals';
 import { useGokiTransactionData } from 'helpers/parser';
-import { gokiTXLink, tsToDate } from 'helpers/utils';
+import { tsToDate } from 'helpers/utils';
 // import { AsyncConfirmButton } from '../../../../../../common/AsyncConfirmButton';
 // import { Card } from '../../../../../../common/governance/Card';
 // import { ExternalLink } from '../../../../../../common/typography/ExternalLink';
 // import { ProseSmall } from '../../../../../../common/typography/Prose';
 // import { ExecuteProposalButton } from '../../../../GovernanceManageView/tabs/ExecutiveCouncilTab/ExecuteProposalButton';
-import { EmbedTX } from '../EmbedTX';
 import { Card } from 'components/common/governance/Card';
 import { Box, Text } from 'degen';
 import Link from 'next/link';
@@ -29,9 +26,9 @@ export const ProposalExecute: React.FC<Props> = ({
   proposal,
   onActivate
 }: Props) => {
-  const { governorW, smartWallet, manifest } = useGovernor();
-  const emergencyDAO = manifest?.addresses?.['emergency-dao']?.address;
-  const { sdkMut } = useSDK();
+  // const { governorW, smartWallet } = useGovernor();
+  // const emergencyDAO = manifest?.addresses?.['emergency-dao']?.address;
+  // const { sdkMut } = useSDK();
   const { ecWallet, isMemberOfEC } = useExecutiveCouncil();
   const { data: gokiTransactionData } = useGokiTransactionData(
     proposal.proposalData.queuedTransaction
diff --git a/hooks/tribeca/useGovernor.ts b/hooks/tribeca/useGovernor.ts
index b0c91a68..ae6538ad 100644
--- a/hooks/tribeca/useGovernor.ts
+++ b/hooks/tribeca/useGovernor.ts
@@ -149,7 +149,20 @@ const useGovernorInner = (props: GovernorProps | undefined) => {
     ? governorData.account.smartWallet
     : governorData;
 
+  const manifest = {
+    governor,
+    proposals: {
+      notice:
+        'To create a proposal, first make a post on the [GGA Discord](https://discord.gg/k3UtYYzcvu).\nOnce you have determined that there is sufficient community support,\nadd the link to the discussion thread and create a proposal.\n',
+      discussion: {
+        required: true,
+        prefix: 've'
+      }
+    }
+  };
+
   return {
+    manifest,
     governor,
     governorW,
     governorData,

From e10da89104f6f2d3069bca98f4890e04be39c8f4 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 17 May 2022 08:03:20 -0500
Subject: [PATCH 038/101] Fix build error

---
 .../locked-voter/CastVoteButton/index.tsx     |  2 +-
 .../ProposalBody/GitHubComments.tsx           | 21 +++--
 .../locked-voter/ProposalHelmet.tsx           | 52 -----------
 .../ProposalIndexView/locked-voter/index.tsx  |  4 +-
 .../ProposalsList/ProposalStateBadge.tsx      | 82 ++++++++++++++----
 components/common/governance/Profile.tsx      | 86 -------------------
 hooks/tribeca/useProposals.ts                 | 13 +--
 package.json                                  |  1 +
 yarn.lock                                     | 25 ++++++
 9 files changed, 114 insertions(+), 172 deletions(-)
 delete mode 100644 components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx
 delete mode 100644 components/common/governance/Profile.tsx

diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
index 47ef4849..b2f0faba 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
@@ -17,7 +17,7 @@ export const CastVoteButton: React.FC<Props> = ({
     <ModalButton
       // tw="max-w-md"
       buttonProps={{
-        variant: 'outline'
+        variant: 'tertiary'
         // css: tw`border-white w-2/5 hover:(border-primary bg-primary bg-opacity-20)`
       }}
       buttonLabel={
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx
index 134797a1..b45a8454 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/GitHubComments.tsx
@@ -1,3 +1,4 @@
+import Image from 'next/image';
 import { Box, Stack, Text } from 'degen';
 import formatDistance from 'date-fns/formatDistance';
 
@@ -18,9 +19,9 @@ export const GitHubComments: React.FC<Props> = ({ issue }: Props) => {
       <Stack space="4">
         {githubComments?.map(comment => (
           <Box key={comment.id} display="flex" width="full" gap="4">
-            <img
+            <Image
               src={comment.user?.avatar_url ?? ''}
-              tw="w-8 h-8 rounded-full"
+              // tw="w-8 h-8 rounded-full"
               alt={`Profile of ${comment.user?.login ?? ''}`}
             />
             <Box
@@ -58,13 +59,15 @@ export const GitHubComments: React.FC<Props> = ({ issue }: Props) => {
           </Box>
         ))}
       </Stack>
-      <div tw="w-full text-center py-8">
-        Got something to say? Add a comment to the{' '}
-        <a href={issue.html_url} target="_blank" rel="noreferrer">
-          proposal on GitHub
-        </a>
-        .
-      </div>
+      <Box width="full" textAlign="center" paddingY="8">
+        <Text>
+          Got something to say? Add a comment to the{' '}
+          <a href={issue.html_url} target="_blank" rel="noreferrer">
+            proposal on GitHub
+          </a>
+          .
+        </Text>
+      </Box>
       {/* </ProseSmall> */}
     </Card>
   );
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx
deleted file mode 100644
index 727184c4..00000000
--- a/components/Proposals/ProposalIndexView/locked-voter/ProposalHelmet.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Helmet } from "react-helmet";
-
-import { useCardinalName } from "../../../../../../hooks/cardinal/useAddressName";
-import { useGovernor } from "../../../../../../hooks/tribeca/useGovernor";
-import type { ProposalInfo } from "../../../../../../hooks/tribeca/useProposals";
-import { tsToDate } from "../../../../../../utils/utils";
-
-interface Props {
-  proposalInfo: ProposalInfo;
-}
-
-export const ProposalHelmet: React.FC<Props> = ({ proposalInfo }: Props) => {
-  const { daoName } = useGovernor();
-  const { index } = proposalInfo;
-
-  const cardinalName = useCardinalName(proposalInfo.proposalData.proposer);
-  const author = cardinalName ?? proposalInfo.proposalData.proposer.toString();
-  const twitterName = cardinalName?.startsWith("@") ? cardinalName : null;
-
-  const title = proposalInfo?.proposalMetaData
-    ? `${daoName ?? "Governance"} Proposal #${index}: ${
-        proposalInfo.proposalMetaData.title
-      }`
-    : `${daoName ?? "Governance"} Proposal #${index}`;
-
-  const description = proposalInfo.proposalMetaData
-    ? proposalInfo.proposalMetaData.descriptionLink.slice(0, 200)
-    : null;
-
-  return (
-    <Helmet>
-      <title>
-        {title} | {daoName}
-      </title>
-
-      {description && <meta name="description" content={description} />}
-      {description && <meta name="og:description" content={description} />}
-      {description && <meta name="twitter:description" content={description} />}
-
-      <meta name="og:title" content={title} />
-      <meta name="og:type" content="article" />
-      <meta
-        name="og:article:published_time"
-        content={tsToDate(proposalInfo.proposalData.createdAt).toISOString()}
-      />
-      {author && <meta name="og:article:author" content={author} />}
-
-      <meta name="twitter:title" content={title} />
-      {twitterName && <meta name="twitter:creator" content={twitterName} />}
-    </Helmet>
-  );
-};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
index 16689b4d..e35d686a 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
@@ -5,7 +5,7 @@ import { useRouter } from 'next/router';
 import { useProposal } from 'hooks/tribeca/useProposals';
 // import { ContentLoader } from '../../../../../common/ContentLoader';
 import { GovernancePage } from 'components/common/governance/GovernancePage';
-import { Profile } from 'components/common/governance/Profile';
+// import { Profile } from 'components/common/governance/Profile';
 // import { PlaceholderSubtitle } from '../../../GovernanceOverviewView/locked-voter/ProposalsList/PlaceholderCard';
 // import { ProposalSubtitle } from '../../../GovernanceOverviewView/locked-voter/ProposalsList/ProposalSubtitle';
 import { ProposalActivate } from './actions/ProposalActivate';
@@ -13,7 +13,7 @@ import { ProposalExecute } from './actions/ProposalExecute';
 import { ProposalQueue } from './actions/ProposalQueue';
 import { ProposalVote } from './actions/ProposalVote';
 import { ProposalDetails } from './ProposalDetails';
-import { ProposalHelmet } from './ProposalHelmet';
+// import { ProposalHelmet } from './ProposalHelmet';
 import { ProposalHistory } from './ProposalHistory';
 import { VotesCard } from './VotesCard';
 import { Box, Stack, Text } from 'degen';
diff --git a/components/Proposals/ProposalsList/ProposalStateBadge.tsx b/components/Proposals/ProposalsList/ProposalStateBadge.tsx
index caef46c2..8310b7dc 100644
--- a/components/Proposals/ProposalsList/ProposalStateBadge.tsx
+++ b/components/Proposals/ProposalsList/ProposalStateBadge.tsx
@@ -1,6 +1,13 @@
 import { ProposalState } from '@tribecahq/tribeca-sdk';
 import { startCase } from 'lodash';
-import { IconCheck, IconPencil, IconClose, IconRefresh } from 'degen';
+import {
+  IconCheck,
+  IconPencil,
+  IconClose,
+  IconRefresh,
+  Box,
+  Text
+} from 'degen';
 import type { ProposalStatus } from 'hooks/tribeca/useProposals';
 
 interface Props {
@@ -20,28 +27,64 @@ const getStateIcon = (state: ProposalState): React.ReactNode => {
   switch (state) {
     case ProposalState.Active:
       return (
-        <div tw="bg-accent text-white h-6 w-6 rounded-full flex items-center justify-center">
-          <IconRefresh />
-        </div>
+        <Box
+          borderRadius="full"
+          color="white"
+          display="flex"
+          alignItems="center"
+          justifyContent="center"
+          backgroundColor="accent"
+          width="6"
+          height="6"
+        >
+          <IconRefresh size="6" />
+        </Box>
       );
     case ProposalState.Canceled:
     case ProposalState.Defeated:
       return (
-        <div tw="bg-gray-500 text-white h-6 w-6 rounded-full flex items-center justify-center">
-          <IconClose />
-        </div>
+        <Box
+          borderRadius="full"
+          color="white"
+          display="flex"
+          alignItems="center"
+          justifyContent="center"
+          backgroundColor="accentSecondary"
+          width="6"
+          height="6"
+        >
+          <IconClose size="6" />
+        </Box>
       );
     case ProposalState.Draft:
       return (
-        <div tw="bg-gray-500 text-white h-6 w-6 rounded-full flex items-center justify-center">
-          <IconPencil />
-        </div>
+        <Box
+          borderRadius="full"
+          color="white"
+          display="flex"
+          alignItems="center"
+          justifyContent="center"
+          backgroundColor="accentSecondary"
+          width="6"
+          height="6"
+        >
+          <IconPencil size="6" />
+        </Box>
       );
     default:
       return (
-        <div tw="bg-primary text-white h-6 w-6 rounded-full flex items-center justify-center">
-          <IconCheck />
-        </div>
+        <Box
+          borderRadius="full"
+          color="white"
+          display="flex"
+          alignItems="center"
+          justifyContent="center"
+          backgroundColor="accent"
+          width="6"
+          height="6"
+        >
+          <IconCheck size="6" />
+        </Box>
       );
   }
 };
@@ -49,11 +92,16 @@ const getStateIcon = (state: ProposalState): React.ReactNode => {
 export const ProposalStateBadge: React.FC<Props> = ({ status }: Props) => {
   const { executed, state } = status;
   return (
-    <div tw="flex flex-col items-center gap-1 lg:(flex-row gap-5)">
+    <Box
+      display="flex"
+      flexDirection={{ lg: 'row', md: 'column' }}
+      alignItems="center"
+      gap={{ lg: '5', md: '1' }}
+    >
       {getStateIcon(state)}
-      <span tw="text-xs md:text-sm text-white">
+      <Text as="span" size="small" color="white">
         {startCase(executed ? 'executed' : STATE_LABELS[state])}
-      </span>
-    </div>
+      </Text>
+    </Box>
   );
 };
diff --git a/components/common/governance/Profile.tsx b/components/common/governance/Profile.tsx
deleted file mode 100644
index f2f2f75d..00000000
--- a/components/common/governance/Profile.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import { useWalletIdentity } from '@cardinal/namespaces-components';
-import { useConnectedWallet, useSolana } from '@saberhq/use-solana';
-import type { PublicKey } from '@solana/web3.js';
-import makeBlockie from 'ethereum-blockies-base64';
-import { FaExclamationTriangle, FaTwitter } from 'react-icons/fa';
-import { Link } from 'react-router-dom';
-
-import { useAddressImage } from '../../../hooks/cardinal/useAddressImage';
-import { useCardinalDisplayName } from '../../../hooks/cardinal/useAddressName';
-import { AddressLink } from '../AddressLink';
-import { ContentLoader } from '../ContentLoader';
-import { MouseoverTooltip } from '../MouseoverTooltip';
-
-interface Props {
-  address: PublicKey;
-  href?: string;
-}
-
-export const Profile: React.FC<Props> = ({ address, href }: Props) => {
-  const { network, connection } = useSolana();
-  const wallet = useConnectedWallet();
-  const { name, displayName } = useCardinalDisplayName(address);
-  const { addressImage, loadingImage } = useAddressImage(address);
-  const { show } = useWalletIdentity();
-  const image = (
-    <img
-      tw="h-10 w-10 rounded-full"
-      alt={`Profile of ${displayName ?? address.toString()}`}
-      src={addressImage ?? makeBlockie(address.toString())}
-    />
-  );
-  return (
-    <div tw="text-sm">
-      <div tw="flex gap-2 items-center">
-        <div tw="h-10 w-10 rounded-full flex">
-          {loadingImage ? (
-            <ContentLoader tw="h-10 w-10 rounded-full" />
-          ) : href ? (
-            <Link to={href}>{image}</Link>
-          ) : (
-            image
-          )}
-        </div>
-        <div tw="flex flex-col leading-normal">
-          <div tw="flex gap-1 items-center">
-            <div tw="h-5 flex items-center">
-              {displayName === undefined ? (
-                <ContentLoader tw="h-4 w-12 rounded" />
-              ) : (
-                <span
-                  css={[
-                    name ? tw`text-white` : tw`text-warmGray-400`,
-                    tw`font-medium`
-                  ]}
-                >
-                  {displayName}
-                </span>
-              )}
-            </div>
-            {name?.startsWith('@') && (
-              <a
-                href={`https://twitter.com/${name.slice(1)}`}
-                target="_blank"
-                rel="noreferrer"
-              >
-                <FaTwitter
-                  css={css`
-                    color: #1da1f2;
-                  `}
-                />
-              </a>
-            )}
-            {name === null && wallet && wallet.publicKey.equals(address) && (
-              <MouseoverTooltip text="Your profile is not verified. Please link your Twitter.">
-                <button onClick={() => show(wallet, connection, network)}>
-                  <FaExclamationTriangle tw="text-yellow-500" />
-                </button>
-              </MouseoverTooltip>
-            )}
-          </div>
-          <AddressLink tw="text-gray-400" address={address} showCopy />
-        </div>
-      </div>
-    </div>
-  );
-};
diff --git a/hooks/tribeca/useProposals.ts b/hooks/tribeca/useProposals.ts
index 77cc5de2..e7f54c13 100644
--- a/hooks/tribeca/useProposals.ts
+++ b/hooks/tribeca/useProposals.ts
@@ -82,9 +82,12 @@ export const useProposal = (index: number) => {
   const id = `000${index}`.slice(-4);
 
   const proposalKeys = useQuery(
-    ['proposalKeys', network, governor.toString(), index],
+    ['proposalKeys', network, governor?.toString(), index],
     async () => {
-      const [proposalKey] = await findProposalAddress(governor, new u64(index));
+      const [proposalKey] = await findProposalAddress(
+        governor!,
+        new u64(index)
+      );
       const [proposalMetaKey] = await findProposalMetaAddress(proposalKey);
       return { proposalKey, proposalMetaKey };
     }
@@ -105,7 +108,7 @@ export const useProposal = (index: number) => {
   const isLoading =
     (queued && !txData) || !proposalData || proposalMetaData === undefined;
   const proposalInfoQuery = useQuery({
-    queryKey: ['proposalInfo', network, governor.toString(), index],
+    queryKey: ['proposalInfo', network, governor?.toString(), index],
     queryFn: (): ProposalInfo => {
       invariant(proposalData);
       return buildProposalInfo({
@@ -176,7 +179,7 @@ export const useProposals = () => {
           .fill(null)
           .map((_, i) => proposalCount - i - 1)
           .map(i => ({
-            queryKey: ['proposalKeys', network, governor.toString(), i],
+            queryKey: ['proposalKeys', network, governor?.toString(), i],
             queryFn: async () => {
               invariant(governorData);
               const [proposalKey] = await findProposalAddress(
@@ -231,7 +234,7 @@ export const useProposals = () => {
           .fill(null)
           .map((_, i) => proposalCount - i - 1)
           .map(i => ({
-            queryKey: ['proposalInfo', network, governor.toString(), i],
+            queryKey: ['proposalInfo', network, governor?.toString(), i],
             queryFn: (): ProposalInfo | null => {
               const proposalData = proposalsData.find(
                 p => p?.accountInfo.data.index.toNumber() === i
diff --git a/package.json b/package.json
index dc441ae6..4fea9588 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "@metaplex/js": "^4.12.0",
     "@nfteyez/sol-rayz": "^0.10.2",
     "@nfteyez/sol-rayz-react": "^0.10.2",
+    "@octokit/plugin-rest-endpoint-methods": "^5.13.0",
     "@project-serum/anchor": "^0.24.2",
     "@saberhq/anchor-contrib": "^1.13.1",
     "@saberhq/sail": "3.4.4",
diff --git a/yarn.lock b/yarn.lock
index 8586e396..4a7b7871 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -681,6 +681,26 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@octokit/openapi-types@^11.2.0":
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-11.2.0.tgz#b38d7fc3736d52a1e96b230c1ccd4a58a2f400a6"
+  integrity sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==
+
+"@octokit/plugin-rest-endpoint-methods@^5.13.0":
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz#8c46109021a3412233f6f50d28786f8e552427ba"
+  integrity sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==
+  dependencies:
+    "@octokit/types" "^6.34.0"
+    deprecation "^2.3.1"
+
+"@octokit/types@^6.34.0":
+  version "6.34.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.34.0.tgz#c6021333334d1ecfb5d370a8798162ddf1ae8218"
+  integrity sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==
+  dependencies:
+    "@octokit/openapi-types" "^11.2.0"
+
 "@project-serum/anchor@0.24.2", "@project-serum/anchor@^0.24.2":
   version "0.24.2"
   resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.24.2.tgz#a3c52a99605c80735f446ca9b3a4885034731004"
@@ -2652,6 +2672,11 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
+deprecation@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
+  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
+
 dequal@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d"

From 7d10a9827b99a2914ceba5e9dbf8a04502e2c46d Mon Sep 17 00:00:00 2001
From: BowTiedHeron <93859808+BowTiedHeron@users.noreply.github.com>
Date: Sat, 30 Apr 2022 14:35:28 +0200
Subject: [PATCH 039/101] merge conflicts with dev 3

---
 components/FarmHeaderComponent/FarmHeaderComponent.tsx | 7 +++----
 hooks/useGemFarm.tsx                                   | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/components/FarmHeaderComponent/FarmHeaderComponent.tsx b/components/FarmHeaderComponent/FarmHeaderComponent.tsx
index 8dc8056b..5ae56f2d 100644
--- a/components/FarmHeaderComponent/FarmHeaderComponent.tsx
+++ b/components/FarmHeaderComponent/FarmHeaderComponent.tsx
@@ -5,13 +5,13 @@ import useGemFarm from 'hooks/useGemFarm';
 
 interface FarmHeaderComponentProps {
   farmerState: string;
-  stakedNFTsInFarm: { [tokenId: string]: NFT; };
+  stakedNFTsInFarm: { [tokenId: string]: NFT };
   farmerVaultLocked: boolean;
   lockVault: () => Promise<void>;
 }
 
 const FarmHeaderComponent = (props: FarmHeaderComponentProps) => {
-  const { farmerState,stakedNFTsInFarm, farmerVaultLocked, lockVault } = props;
+  const { farmerState, stakedNFTsInFarm, farmerVaultLocked, lockVault } = props;
   const {
     farmerAcc,
     farmAcc,
@@ -149,8 +149,7 @@ const FarmHeaderComponent = (props: FarmHeaderComponentProps) => {
           >
             {`Claim $${rewardTokenName}`}
           </Button>
-          {(Object.values(stakedNFTsInFarm).length > 0 &&
-            !farmerVaultLocked) && (
+          {Object.values(stakedNFTsInFarm).length > 0 && !farmerVaultLocked && (
             <Button
               onClick={() => withTxLoading(lockVault, 'stake')}
               loading={txLoading.value && txLoading.txName === 'stake'}
diff --git a/hooks/useGemFarm.tsx b/hooks/useGemFarm.tsx
index 86c2485d..ee399de3 100644
--- a/hooks/useGemFarm.tsx
+++ b/hooks/useGemFarm.tsx
@@ -69,7 +69,7 @@ const useGemFarm = () => {
   const [selectedWalletNFTs, setSelectedWalletNFTs] = useState<NFT[]>([]);
   const [selectedVaultNFTs, setSelectedVaultNFTs] = useState<NFT[]>([]);
 
-  console.log(wallet?.connected)
+  console.log(wallet?.connected);
 
   // Get farm and bank addresses from router
   const router = useRouter();
@@ -219,7 +219,6 @@ const useGemFarm = () => {
     }
   }, [isStartingGemFarm, setNFTs]);
 
-
   const onRefreshNFTs = async () => {
     if (!gb) return;
     const results = await Promise.all([

From dc088ed05eb353da6261b464f3494e4b49f7492c Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo@brainrex.com>
Date: Mon, 16 May 2022 16:56:18 +0200
Subject: [PATCH 040/101] conflicts 4

---
 .env.example   | 3 ++-
 pages/_app.tsx | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 8031f110..8dbca527 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,7 @@
 NEXT_PUBLIC_RPC_NODE = 'https://api.mainnet-beta.solana.com'
+NEXT_PUBLIC_GA=
 NEXT_PUBLIC_STAKE_POOL_ADDR=
 NEXT_PUBLIC_VOTE_PROGRAM_ID=
 NEXT_PUBLIC_GOVERNOR_ADDRESS=
 NEXT_PUBLIC_SMART_WALLET_ADDRESS=
-NEXT_PUBLIC_LOCKER_ADDR=
\ No newline at end of file
+NEXT_PUBLIC_LOCKER_ADDR=
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 7780a1b1..ce590584 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -16,6 +16,7 @@ import 'degen/styles';
 import '../styles/globals.css';
 import 'react-toastify/dist/ReactToastify.css';
 import { GovernorProvider } from 'hooks/tribeca/useGovernor';
+import Script from 'next/script';
 
 const queryClient = new QueryClient();
 const network = process.env.NETWORK as Network;

From e0b5c15cf74d1c67d8e3f1cfa868d034aa35816e Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Mon, 16 May 2022 17:02:00 +0200
Subject: [PATCH 041/101] feat: add google analytics 4 (#139)

The following changes have been made:

Modified pages/_app.ts to use the built-in NextJS <Script> tag, in order to add GA4 global site tag.
---
 pages/_app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/_app.tsx b/pages/_app.tsx
index ce590584..551fe342 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -11,12 +11,12 @@ import { ToastContainer } from 'react-toastify';
 import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
 import SecPopup from 'components/SecPopup';
 import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
+import Script from 'next/script';
 
 import 'degen/styles';
 import '../styles/globals.css';
 import 'react-toastify/dist/ReactToastify.css';
 import { GovernorProvider } from 'hooks/tribeca/useGovernor';
-import Script from 'next/script';
 
 const queryClient = new QueryClient();
 const network = process.env.NETWORK as Network;

From a43a7c043dc87d89071d21b95cc18642592292e5 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Wed, 11 May 2022 07:46:34 -0500
Subject: [PATCH 042/101] Initial commit for governance

---
 components/HelperCard.tsx | 32 ++++++++++++++++++++++++++++++++
 pages/_app.tsx            |  6 ++++++
 2 files changed, 38 insertions(+)
 create mode 100644 components/HelperCard.tsx

diff --git a/components/HelperCard.tsx b/components/HelperCard.tsx
new file mode 100644
index 00000000..cb2d1c17
--- /dev/null
+++ b/components/HelperCard.tsx
@@ -0,0 +1,32 @@
+import { Box } from 'degen';
+
+interface Props {
+  children?: React.ReactNode;
+  className?: string;
+  variant?: 'primary' | 'muted' | 'error' | 'warn';
+}
+
+export const HelperCard: React.FC<Props> = ({
+  children,
+  variant = 'primary',
+  className
+}: Props) => {
+  let border = 'border';
+  switch (variant) {
+    case 'primary':
+    case 'muted':
+    case 'error':
+    case 'warn':
+  }
+  return (
+    <Box
+      paddingX="4"
+      paddingY="2"
+      borderWidth="1"
+      fontSize="small"
+      className={className}
+    >
+      {children}
+    </Box>
+  );
+};
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 551fe342..ab3fda8c 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -12,6 +12,12 @@ import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
 import SecPopup from 'components/SecPopup';
 import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
 import Script from 'next/script';
+import { GOVERNOR_ADDRESS, SDKProvider } from 'helpers/sdk';
+
+import 'degen/styles';
+import '../styles/globals.css';
+import 'react-toastify/dist/ReactToastify.css';
+import { GovernorProvider } from 'hooks/tribeca/useGovernor';
 
 import 'degen/styles';
 import '../styles/globals.css';

From 7dcebb55de160f9b69c0a5749970d8928c4e218d Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 17 May 2022 04:33:22 -0500
Subject: [PATCH 043/101] Upgrade locker program

---
 pages/_app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/_app.tsx b/pages/_app.tsx
index ab3fda8c..a813cde3 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -12,7 +12,7 @@ import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
 import SecPopup from 'components/SecPopup';
 import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
 import Script from 'next/script';
-import { GOVERNOR_ADDRESS, SDKProvider } from 'helpers/sdk';
+import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
 
 import 'degen/styles';
 import '../styles/globals.css';

From a7d8cff0ec917d21b785e780c7a41b5d5a6c08e0 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 17 May 2022 08:53:51 -0500
Subject: [PATCH 044/101] Fix conflict

---
 pages/_app.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pages/_app.tsx b/pages/_app.tsx
index a813cde3..177c05d0 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,3 +1,4 @@
+import Script from 'next/script';
 import { useEffect, useState } from 'react';
 import { WalletKitProvider } from '@gokiprotocol/walletkit';
 import { Network } from '@saberhq/solana-contrib';
@@ -11,18 +12,11 @@ import { ToastContainer } from 'react-toastify';
 import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
 import SecPopup from 'components/SecPopup';
 import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
-import Script from 'next/script';
-import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
-
-import 'degen/styles';
-import '../styles/globals.css';
-import 'react-toastify/dist/ReactToastify.css';
 import { GovernorProvider } from 'hooks/tribeca/useGovernor';
 
 import 'degen/styles';
 import '../styles/globals.css';
 import 'react-toastify/dist/ReactToastify.css';
-import { GovernorProvider } from 'hooks/tribeca/useGovernor';
 
 const queryClient = new QueryClient();
 const network = process.env.NETWORK as Network;

From ba4cdf896bb72d2126618e50003c2ea70da07b1a Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 17 May 2022 08:58:28 -0500
Subject: [PATCH 045/101] Replace proposal prefix

---
 hooks/tribeca/useGovernor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hooks/tribeca/useGovernor.ts b/hooks/tribeca/useGovernor.ts
index ae6538ad..304e13ef 100644
--- a/hooks/tribeca/useGovernor.ts
+++ b/hooks/tribeca/useGovernor.ts
@@ -156,7 +156,7 @@ const useGovernorInner = (props: GovernorProps | undefined) => {
         'To create a proposal, first make a post on the [GGA Discord](https://discord.gg/k3UtYYzcvu).\nOnce you have determined that there is sufficient community support,\nadd the link to the discussion thread and create a proposal.\n',
       discussion: {
         required: true,
-        prefix: 've'
+        prefix: 'https://forum.honey.finance/t'
       }
     }
   };

From 01b420376992a8efcbdcc5842b320b4456b5a433 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Wed, 18 May 2022 18:05:06 -0500
Subject: [PATCH 046/101] Update tribeca sdk

---
 .../ProposalConfirmationModal/index.tsx       |    4 +-
 .../locked-voter/ProposalCreateInner.tsx      |   28 +-
 .../CastVoteButton/CastVoteModal.tsx          |    9 +-
 .../CastVoteButton/VoteResult.tsx             |    9 +-
 .../CastVoteButton/VoteSelectContents.tsx     |  114 +-
 .../locked-voter/CastVoteButton/index.tsx     |    5 +-
 .../locked-voter/ProposalHistory.tsx          |    4 +-
 .../locked-voter/VotesCard.tsx                |    4 +-
 .../locked-voter/actions/ProposalActivate.tsx |   11 +-
 .../locked-voter/actions/ProposalVote.tsx     |    4 +-
 .../ProposalIndexView/locked-voter/index.tsx  |    2 +-
 .../ProposalsList/PlaceholderCard.tsx         |    2 +-
 .../Proposals/ProposalsList/ProposalCard.tsx  |   13 +-
 .../ProposalsList/ProposalStateBadge.tsx      |    2 +-
 .../ProposalsList/ProposalStateDate.tsx       |    4 +-
 .../ProposalsList/ProposalStateLabel.tsx      |    6 +-
 components/Proposals/ProposalsList/index.tsx  |    2 +-
 components/common/governance/Meter.tsx        |    4 +-
 helpers/dao/constants.ts                      |   92 +
 helpers/dao/index.ts                          |    4 +
 helpers/dao/programs/govern.ts                |   39 +
 helpers/dao/programs/index.ts                 |    2 +
 helpers/dao/programs/lockedVoter.ts           |   22 +
 helpers/dao/sdk.ts                            |  101 +
 helpers/dao/wrappers/govern/govern.ts         |   71 +
 helpers/dao/wrappers/govern/governor.ts       |  280 +++
 helpers/dao/wrappers/govern/index.ts          |    6 +
 helpers/dao/wrappers/govern/pda.ts            |   68 +
 helpers/dao/wrappers/govern/proposal.ts       |   35 +
 helpers/dao/wrappers/govern/setup.ts          |   95 +
 helpers/dao/wrappers/govern/types.ts          |   97 +
 helpers/dao/wrappers/index.ts                 |    2 +
 helpers/dao/wrappers/lockedVoter/escrow.ts    |  231 +++
 helpers/dao/wrappers/lockedVoter/index.ts     |    4 +
 helpers/dao/wrappers/lockedVoter/locker.ts    |  452 +++++
 helpers/dao/wrappers/lockedVoter/pda.ts       |   43 +
 helpers/dao/wrappers/lockedVoter/setup.ts     |   89 +
 helpers/idl/stake.json                        |   75 +
 helpers/parser.ts                             |    3 +-
 helpers/sdk/constant.ts                       |   28 +-
 helpers/sdk/gov.ts                            |    4 +-
 helpers/sdk/index.ts                          |    1 +
 helpers/sdk/pda.ts                            |   42 +
 helpers/sdk/stake.ts                          |    4 +-
 helpers/sdk/vehoney.ts                        |    2 +-
 helpers/types/govern.ts                       | 1719 +++++++++++++++++
 helpers/types/stake.ts                        |  150 ++
 helpers/utils.ts                              |    2 +-
 hooks/tribeca/useEscrow.ts                    |   12 +-
 hooks/tribeca/useGovernor.ts                  |    4 +-
 hooks/tribeca/useProposals.ts                 |    4 +-
 hooks/tribeca/useVote.ts                      |    2 +-
 hooks/useParsedInstruction.ts                 |    2 +-
 icons/PulsingDot.tsx                          |    6 +-
 package.json                                  |    8 +-
 pages/_app.tsx                                |    8 +-
 yarn.lock                                     |   37 +-
 57 files changed, 3879 insertions(+), 194 deletions(-)
 create mode 100644 helpers/dao/constants.ts
 create mode 100644 helpers/dao/index.ts
 create mode 100644 helpers/dao/programs/govern.ts
 create mode 100644 helpers/dao/programs/index.ts
 create mode 100644 helpers/dao/programs/lockedVoter.ts
 create mode 100644 helpers/dao/sdk.ts
 create mode 100644 helpers/dao/wrappers/govern/govern.ts
 create mode 100644 helpers/dao/wrappers/govern/governor.ts
 create mode 100644 helpers/dao/wrappers/govern/index.ts
 create mode 100644 helpers/dao/wrappers/govern/pda.ts
 create mode 100644 helpers/dao/wrappers/govern/proposal.ts
 create mode 100644 helpers/dao/wrappers/govern/setup.ts
 create mode 100644 helpers/dao/wrappers/govern/types.ts
 create mode 100644 helpers/dao/wrappers/index.ts
 create mode 100644 helpers/dao/wrappers/lockedVoter/escrow.ts
 create mode 100644 helpers/dao/wrappers/lockedVoter/index.ts
 create mode 100644 helpers/dao/wrappers/lockedVoter/locker.ts
 create mode 100644 helpers/dao/wrappers/lockedVoter/pda.ts
 create mode 100644 helpers/dao/wrappers/lockedVoter/setup.ts
 create mode 100644 helpers/sdk/pda.ts
 create mode 100644 helpers/types/govern.ts

diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
index a26d128c..9ec552e0 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
@@ -2,7 +2,7 @@ import { useSail } from '@saberhq/sail';
 import { buildStubbedTransaction } from '@saberhq/solana-contrib';
 import { useSolana } from '@saberhq/use-solana';
 import type { TransactionInstruction } from '@solana/web3.js';
-import { GovernorWrapper } from '@tribecahq/tribeca-sdk';
+import { GovernorWrapper } from 'helpers/dao';
 import ReactMarkdown from 'react-markdown';
 import invariant from 'tiny-invariant';
 import { useRouter } from 'next/router';
@@ -59,7 +59,7 @@ export const ProposalConfirmModal: React.FC<Props> = ({
     //     -4
     //   )} created`
     // });
-    router.push(`proposals/${createProposal.index.toString()}`);
+    router.push(`${createProposal.index.toString()}`);
     modalProps.onDismiss();
   };
 
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
index dad142a5..76b3e742 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -115,21 +115,23 @@ export const ProposalCreateInner: React.FC = () => {
               {/* </HelperCard> */}
               {proposalCfg?.notice && (
                 <HelperCard variant="primary">
-                  <div
-                  // css={css`
-                  //   p {
-                  //     ${tw`mb-2`}
-                  //   }
-                  //   a {
-                  //     ${tw`text-white`}
-                  //     &:hover {
-                  //       ${tw`underline`}
-                  //     }
-                  //   }
-                  // `}
+                  <Box
+                    color="white"
+                    fontWeight="bold"
+                    // css={css`
+                    //   p {
+                    //     ${tw`mb-2`}
+                    //   }
+                    //   a {
+                    //     ${tw`text-white`}
+                    //     &:hover {
+                    //       ${tw`underline`}
+                    //     }
+                    //   }
+                    // `}
                   >
                     <ReactMarkdown>{proposalCfg.notice}</ReactMarkdown>
-                  </div>
+                  </Box>
                 </HelperCard>
               )}
               {/* <label tw="flex flex-col gap-1" htmlFor="title">
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
index b276a848..926cfbf5 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
@@ -1,6 +1,6 @@
 import { useSail } from '@saberhq/sail';
 import { createMemoInstruction } from '@saberhq/solana-contrib';
-import type { VoteSide } from '@tribecahq/tribeca-sdk';
+import type { VoteSide } from 'helpers/dao';
 import { useState } from 'react';
 import invariant from 'tiny-invariant';
 
@@ -12,6 +12,7 @@ import { ModalInner } from 'components/Modal/ModalInner';
 import { VOTE_SIDE_LABEL } from '../VotesCard';
 import { VoteResult } from './VoteResult';
 import { VoteSelectContents } from './VoteSelectContents';
+import { Text } from 'degen';
 
 interface Props {
   proposalInfo: ProposalInfo;
@@ -58,7 +59,11 @@ export const CastVoteModal: React.FC<Props> = ({ proposalInfo }: Props) => {
 
   return (
     <ModalInner
-      title="Cast Vote"
+      title={
+        <Text variant="large" ellipsis>
+          Cast Vote
+        </Text>
+      }
       // tw="px-6 max-w-md"
       buttonProps={{
         disabled: !(side && escrow),
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx
index 574ddcc5..9195c959 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteResult.tsx
@@ -1,4 +1,4 @@
-import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { VoteSide } from 'helpers/dao';
 
 import { useGovernor } from 'hooks/tribeca/useGovernor';
 import type { ProposalInfo } from 'hooks/tribeca/useProposals';
@@ -47,7 +47,11 @@ export const VoteResult: React.FC<Props> = ({
 }: Props) => {
   return (
     <ModalInner
-      title="Vote Confirmed"
+      title={
+        <Text variant="large" ellipsis>
+          Vote Confirmed
+        </Text>
+      }
       // tw="px-6 max-w-md"
     >
       <Stack align="center">
@@ -57,6 +61,7 @@ export const VoteResult: React.FC<Props> = ({
           alignItems="center"
           maxWidth="screenSm"
           gap="3"
+          textAlign="center"
         >
           <Text as="h2" size="large" color="white" weight="semiBold">
             You{' '}
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx
index 612a0ed4..f6f9c131 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/VoteSelectContents.tsx
@@ -1,5 +1,5 @@
 import { Box, Button, Text, Textarea } from 'degen';
-import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { VoteSide } from 'helpers/dao';
 import { sum } from 'lodash';
 import invariant from 'tiny-invariant';
 
@@ -52,83 +52,49 @@ export const VoteSelectContents: React.FC<Props> = ({
               <Button
                 // tw="flex items-center gap-4 px-5 py-4 border rounded border-warmGray-600 transition-all"
                 key={voteSide}
-                // css={[
-                //   side === voteSide && {
-                //     borderColor: sideColor(voteSide)
-                //   }
-                // ]}
+                width="full"
                 onClick={() => setSide(voteSide)}
+                variant={side === voteSide ? 'primary' : 'tertiary'}
+                prefix={<Text>{VOTE_SIDE_LABEL[voteSide]}</Text>}
+                suffix={<Text>{percent}</Text>}
+                center
               >
-                <Box>
-                  <Box
-                    width="6"
-                    height="6"
-                    // css={[tw`border border-gray-500`, tw`w-6 h-6`]}
-                  >
-                    <svg
-                      // tw="w-full h-full"
-                      // css={[
-                      //   css`
-                      //     stroke-width: 15px;
-                      //     fill: none;
-                      //     & > path {
-                      //       stroke: ${sideColor(voteSide)};
-                      //     }
-                      //   `,
-                      //   side === voteSide &&
-                      //     css`
-                      //       & > path {
-                      //         stroke-dashoffset: 0;
-                      //         transition: stroke-dashoffset 0.1s ease-in 0s;
-                      //       }
-                      //     `
-                      // ]}
-                      viewBox="0 0 100 100"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      {voteSide === VoteSide.For ? (
-                        <path
-                          d="M 10 50 L 40 86 L 90 10"
-                          strokeDasharray="140"
-                          strokeDashoffset="140"
-                        ></path>
-                      ) : (
-                        <>
-                          <path
-                            d="M 10 10 L 90 90"
-                            strokeDasharray="113"
-                            strokeDashoffset="113"
-                          ></path>
-                          <path
-                            d="M 90 10 L 10 90"
-                            strokeDasharray="113"
-                            strokeDashoffset="113"
-                          ></path>
-                        </>
-                      )}
-                    </svg>
+                {/* <Box
+                  display="flex"
+                  alignItems="center"
+                  gap="4"
+                  paddingX="5"
+                  paddingY="4"
+                  width="full"
+                > */}
+                {/* <Box
+                  display="flex"
+                  flexDirection="column"
+                  flexGrow={1}
+                  // alignItems="center"
+                  gap="4"
+                  paddingX="5"
+                  paddingY="4"
+                  width="full"
+                > */}
+                {/* <Box
+                  width="full"
+                  display="flex"
+                  alignItems="center"
+                  justifyContent="space-between"
+                >
+                  <Box color="white" fontWeight="medium">
+                    {VOTE_SIDE_LABEL[voteSide]}
                   </Box>
-                </Box>
-                <Box display="flex" flexDirection="column" flexGrow={1}>
-                  <Box
-                    width="full"
-                    display="flex"
-                    alignItems="center"
-                    justifyContent="center"
-                  >
-                    <Box color="white" fontWeight="medium">
-                      {VOTE_SIDE_LABEL[voteSide]}
-                    </Box>
-                    <Box fontWeight="medium" color="accentText">
-                      {percent}
-                    </Box>
+                  <Box fontWeight="medium" color="accentText">
+                    {percent}
                   </Box>
-                  <Meter
-                    value={myVotes}
-                    max={totalVotes === 0 ? 1 : totalVotes}
-                    barColor={sideColor(voteSide)}
-                  />
-                </Box>
+                </Box> */}
+                <Meter
+                  value={myVotes}
+                  max={totalVotes === 0 ? 1 : totalVotes}
+                  barColor={sideColor(voteSide)}
+                />
               </Button>
             );
           }
diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
index b2f0faba..8f09ee09 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/index.tsx
@@ -1,4 +1,4 @@
-import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { VoteSide } from 'helpers/dao';
 
 import type { ProposalInfo } from 'hooks/tribeca/useProposals';
 import { ModalButton } from 'components/Modal/ModalButton';
@@ -17,7 +17,8 @@ export const CastVoteButton: React.FC<Props> = ({
     <ModalButton
       // tw="max-w-md"
       buttonProps={{
-        variant: 'tertiary'
+        size: 'small',
+        width: '1/2'
         // css: tw`border-white w-2/5 hover:(border-primary bg-primary bg-opacity-20)`
       }}
       buttonLabel={
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
index 79d1582a..658c36de 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
@@ -1,11 +1,11 @@
 import type { SmartWalletTransactionData } from '@gokiprotocol/client';
 import type { ProgramAccount } from '@saberhq/token-utils';
-import type { ProposalData } from '@tribecahq/tribeca-sdk';
+import type { ProposalData } from 'helpers/dao';
 import {
   getProposalState,
   PROPOSAL_STATE_LABELS,
   ProposalState
-} from '@tribecahq/tribeca-sdk';
+} from 'helpers/dao';
 import BN from 'bn.js';
 import { startCase } from 'lodash';
 import { Box, IconLink, Text } from 'degen';
diff --git a/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx b/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
index 73ce423e..f711bf3e 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
@@ -1,6 +1,6 @@
 import { Fraction } from '@saberhq/token-utils';
-import type { ProposalData } from '@tribecahq/tribeca-sdk';
-import { VoteSide } from '@tribecahq/tribeca-sdk';
+import type { ProposalData } from 'helpers/dao';
+import { VoteSide } from 'helpers/dao';
 import { Box, Spinner } from 'degen';
 import BN from 'bn.js';
 
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
index 3e2df3c7..823f7281 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalActivate.tsx
@@ -83,11 +83,16 @@ export const ProposalActivate: React.FC<Props> = ({
           </Box>
         ) : minActivationThreshold &&
           veBalance?.greaterThan(minActivationThreshold) ? (
-          <Box display="flex" justifyContent="center" alignItems="center">
+          <Box
+            display="flex"
+            justifyContent="center"
+            alignItems="center"
+            width="full"
+          >
             <Button
               disabled={!escrow}
-              // tw="w-3/4 dark:text-white hover:dark:text-primary hover:dark:border-primary"
-              variant="tertiary"
+              size="small"
+              width="3/4"
               onClick={async () => {
                 invariant(escrow);
                 const tx = escrow.escrowW.activateProposal(
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
index c69140b4..635393e9 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
@@ -1,7 +1,7 @@
 import { ConnectWalletButton } from '@gokiprotocol/walletkit';
 import { TokenAmount } from '@saberhq/token-utils';
-import type { VoteSide } from '@tribecahq/tribeca-sdk';
-import { VOTE_SIDE_LABELS } from '@tribecahq/tribeca-sdk';
+import type { VoteSide } from 'helpers/dao';
+import { VOTE_SIDE_LABELS } from 'helpers/dao';
 
 import { useSDK } from 'helpers/sdk';
 import { useUserEscrow } from 'hooks/tribeca/useEscrow';
diff --git a/components/Proposals/ProposalIndexView/locked-voter/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
index e35d686a..6bd776d2 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
@@ -1,4 +1,4 @@
-import { ProposalState, VoteSide } from '@tribecahq/tribeca-sdk';
+import { ProposalState, VoteSide } from 'helpers/dao';
 import { noop } from 'lodash';
 import { useRouter } from 'next/router';
 
diff --git a/components/Proposals/ProposalsList/PlaceholderCard.tsx b/components/Proposals/ProposalsList/PlaceholderCard.tsx
index 2d29223e..e2bbdf28 100644
--- a/components/Proposals/ProposalsList/PlaceholderCard.tsx
+++ b/components/Proposals/ProposalsList/PlaceholderCard.tsx
@@ -1,4 +1,4 @@
-import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { ProposalState } from 'helpers/dao';
 import { Box, Skeleton } from 'degen';
 import React from 'react';
 
diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
index bda16b0a..251d7060 100644
--- a/components/Proposals/ProposalsList/ProposalCard.tsx
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -1,4 +1,4 @@
-import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { ProposalState } from 'helpers/dao';
 import { Box, Text } from 'degen';
 import Link from 'next/link';
 
@@ -10,18 +10,19 @@ import { ProposalStateBadge } from './ProposalStateBadge';
 import { ProposalStateDate } from './ProposalStateDate';
 import { ProposalStateLabel } from './ProposalStateLabel';
 import { PulsingDot } from 'icons/PulsingDot';
+import { useRouter } from 'next/router';
 
 interface Props {
   proposalInfo: ProposalInfo;
 }
 
 export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
-  // const { path } = useGovernor();
+  const router = useRouter();
   const { state, executed } = proposalInfo.status;
   return (
     <Link
       passHref
-      href={`proposals/${proposalInfo.index}`}
+      href={`${router.pathname}/proposals/${proposalInfo.index}`}
       // tw="flex items-center justify-between py-5 px-6 border-l-2 border-l-transparent border-b border-b-warmGray-800 cursor-pointer hover:border-l-primary"
     >
       <Box
@@ -39,7 +40,11 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
           width={{ md: '192', xs: '3/4' }}
           // tw="flex items-center gap-5 w-3/4 md:w-[500px]"
         >
-          {state === ProposalState.Active && <PulsingDot color="decendent" />}
+          {state === ProposalState.Active && (
+            <Box width="11" height="11">
+              <PulsingDot color="decendent" />
+            </Box>
+          )}
           <div>
             <Box display="flex" alignItems="center">
               <Text
diff --git a/components/Proposals/ProposalsList/ProposalStateBadge.tsx b/components/Proposals/ProposalsList/ProposalStateBadge.tsx
index 8310b7dc..5f5a5d51 100644
--- a/components/Proposals/ProposalsList/ProposalStateBadge.tsx
+++ b/components/Proposals/ProposalsList/ProposalStateBadge.tsx
@@ -1,4 +1,4 @@
-import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { ProposalState } from 'helpers/dao';
 import { startCase } from 'lodash';
 import {
   IconCheck,
diff --git a/components/Proposals/ProposalsList/ProposalStateDate.tsx b/components/Proposals/ProposalsList/ProposalStateDate.tsx
index 7d9a0dc4..cd7da4af 100644
--- a/components/Proposals/ProposalsList/ProposalStateDate.tsx
+++ b/components/Proposals/ProposalsList/ProposalStateDate.tsx
@@ -1,5 +1,5 @@
-import type { ProposalData } from '@tribecahq/tribeca-sdk';
-import { ProposalState } from '@tribecahq/tribeca-sdk';
+import type { ProposalData } from 'helpers/dao';
+import { ProposalState } from 'helpers/dao';
 import type BN from 'bn.js';
 import Countdown from 'react-countdown';
 
diff --git a/components/Proposals/ProposalsList/ProposalStateLabel.tsx b/components/Proposals/ProposalsList/ProposalStateLabel.tsx
index dbea0f39..9ca4a1c6 100644
--- a/components/Proposals/ProposalsList/ProposalStateLabel.tsx
+++ b/components/Proposals/ProposalsList/ProposalStateLabel.tsx
@@ -1,4 +1,4 @@
-import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { ProposalState } from 'helpers/dao';
 import { Box, BoxProps, Text } from 'degen';
 import { startCase } from 'lodash';
 
@@ -20,8 +20,8 @@ export const ProposalStateLabel: React.FC<Props> = ({
   state,
   executed
 }: Props) => {
-  let borderColor: BoxProps['color'] = 'inherit';
-  let textColor: BoxProps['color'] = 'inherit';
+  let borderColor: BoxProps['color'] = 'accent';
+  let textColor: BoxProps['color'] = 'accent';
   if (
     state === ProposalState.Canceled ||
     state === ProposalState.Defeated ||
diff --git a/components/Proposals/ProposalsList/index.tsx b/components/Proposals/ProposalsList/index.tsx
index 3f3db7dc..486799e5 100644
--- a/components/Proposals/ProposalsList/index.tsx
+++ b/components/Proposals/ProposalsList/index.tsx
@@ -1,4 +1,4 @@
-import { ProposalState } from '@tribecahq/tribeca-sdk';
+import { ProposalState } from 'helpers/dao';
 import { useState } from 'react';
 import Link from 'next/link';
 
diff --git a/components/common/governance/Meter.tsx b/components/common/governance/Meter.tsx
index d393f8ba..76c902e1 100644
--- a/components/common/governance/Meter.tsx
+++ b/components/common/governance/Meter.tsx
@@ -25,7 +25,7 @@ export const Meter: React.FC<Props> = ({
       flexGrow={1}
       backgroundColor="accent"
       height="1"
-      borderRadius="medium"
+      borderRadius="full"
     >
       <Box
         style={{
@@ -33,7 +33,7 @@ export const Meter: React.FC<Props> = ({
           backgroundColor: barColor
         }}
         height="1"
-        borderRadius="medium"
+        borderRadius="full"
         backgroundColor="backgroundSecondary"
         // tw="bg-primary h-1 rounded transition-all"
       />
diff --git a/helpers/dao/constants.ts b/helpers/dao/constants.ts
new file mode 100644
index 00000000..7dd2ee95
--- /dev/null
+++ b/helpers/dao/constants.ts
@@ -0,0 +1,92 @@
+import { buildCoderMap } from '@saberhq/anchor-contrib';
+import { PublicKey } from '@solana/web3.js';
+import BN from 'bn.js';
+import { GovernJSON } from 'helpers/types/govern';
+import { IDL as LockedVoterJSON } from 'helpers/types/ve_honey';
+
+import type {
+  GovernanceParameters,
+  GovernProgram,
+  GovernTypes,
+  LockedVoterProgram,
+  LockedVoterTypes,
+  LockerParamsV2
+} from './programs';
+
+/**
+ * Tribeca program types.
+ */
+export interface TribecaPrograms {
+  Govern: GovernProgram;
+  LockedVoter: LockedVoterProgram;
+}
+
+// See `Anchor.toml` for all addresses.
+export const HONEY_DAO_ADDRESSES = {
+  Govern: new PublicKey('Govz1VyoyLD5BL6CSCxUJLVLsQHRwjfFj1prNsdNg5Jw'),
+  LockedVoter: new PublicKey(process.env.NEXT_PUBLIC_VOTE_PROGRAM_ID!)
+};
+
+/**
+ * Program IDLs.
+ */
+export const HONEY_DAO_IDLS = {
+  Govern: GovernJSON,
+  LockedVoter: LockedVoterJSON
+};
+
+/**
+ * Coders.
+ */
+export const HONEY_DAO_CODERS = buildCoderMap<{
+  Govern: GovernTypes;
+  LockedVoter: LockedVoterTypes;
+}>(HONEY_DAO_IDLS, HONEY_DAO_ADDRESSES);
+
+export const DEFAULT_DECIMALS = 6;
+
+export const ONE_DAY = new BN(24 * 60 * 60);
+
+/**
+ * Number of seconds in one year.
+ */
+export const ONE_YEAR = new BN(365).mul(ONE_DAY);
+
+// Default number of votes in support of a proposal required in order for a quorum to be reached and for a vote to succeed
+// ~ 4% of 10 billion
+export const DEFAULT_QUORUM_VOTES = new BN(10000000000 * 0.04).mul(
+  new BN(10).pow(new BN(DEFAULT_DECIMALS))
+);
+// Default number of votes required in order for a voter to become a proposer
+// ~ 1% of 10 billion
+export const DEFAULT_PROPOSAL_THRESHOLD = new BN(10000000000 * 0.01).mul(
+  new BN(10).pow(new BN(DEFAULT_DECIMALS))
+);
+// Default delay before voting on a proposal may take place, once proposed, ~ 1 second
+export const DEFAULT_VOTE_DELAY = new BN(1);
+// Default duration of voting on a proposal, in seconds, ~ 3 days
+export const DEFAULT_VOTE_PERIOD = new BN(3).mul(ONE_DAY);
+
+/**
+ * Default parameters for a Governor.
+ */
+export const DEFAULT_GOVERNANCE_PARAMETERS: GovernanceParameters = {
+  timelockDelaySeconds: new BN(0),
+  quorumVotes: DEFAULT_QUORUM_VOTES,
+  votingDelay: DEFAULT_VOTE_DELAY,
+  votingPeriod: DEFAULT_VOTE_PERIOD
+};
+
+/**
+ * Default parameters for a Locker.
+ */
+export const DEFAULT_LOCKER_PARAMS: LockerParamsV2 = {
+  // 1M tokens if max locked.
+  proposalActivationMinVotes: new BN(10_000_000 * 10 ** 6),
+  // 1 day.
+  minStakeDuration: ONE_DAY,
+  // 5 years.
+  maxStakeDuration: new BN(5).mul(ONE_YEAR),
+  multiplier: 10,
+  whitelistEnabled: false
+};
diff --git a/helpers/dao/index.ts b/helpers/dao/index.ts
new file mode 100644
index 00000000..8a5ce295
--- /dev/null
+++ b/helpers/dao/index.ts
@@ -0,0 +1,4 @@
+export * from "./constants";
+export * from "./programs";
+export * from "./sdk";
+export * from "./wrappers";
diff --git a/helpers/dao/programs/govern.ts b/helpers/dao/programs/govern.ts
new file mode 100644
index 00000000..1d8f114a
--- /dev/null
+++ b/helpers/dao/programs/govern.ts
@@ -0,0 +1,39 @@
+import type { AnchorTypes } from '@saberhq/anchor-contrib';
+import type { AccountMeta } from '@solana/web3.js';
+
+import type { GovernIDL } from '../../types/govern';
+
+export * from '../../types/govern';
+
+export type GovernTypes = AnchorTypes<
+  GovernIDL,
+  {
+    governor: GovernorData;
+    proposal: ProposalData;
+    vote: VoteData;
+    proposalMeta: ProposalMetaData;
+  },
+  {
+    ProposalInstruction: ProposalInstruction;
+    ProposalAccountMeta: AccountMeta;
+    GovernanceParameters: GovernanceParameters;
+  }
+>;
+
+type Accounts = GovernTypes['Accounts'];
+export type GovernorData = Accounts['Governor'];
+export type ProposalData = Accounts['Proposal'];
+export type VoteData = Accounts['Vote'];
+export type ProposalMetaData = Accounts['ProposalMeta'] & {
+  title: string;
+  descriptionLink: string;
+};
+
+export type GovernanceParameters =
+  GovernTypes['Defined']['GovernanceParameters'];
+export type ProposalInstruction =
+  GovernTypes['Defined']['ProposalInstruction'] & {
+    keys: AccountMeta[];
+  };
+
+export type GovernProgram = GovernTypes['Program'];
diff --git a/helpers/dao/programs/index.ts b/helpers/dao/programs/index.ts
new file mode 100644
index 00000000..ed9900ed
--- /dev/null
+++ b/helpers/dao/programs/index.ts
@@ -0,0 +1,2 @@
+export * from './govern';
+export * from './lockedVoter';
diff --git a/helpers/dao/programs/lockedVoter.ts b/helpers/dao/programs/lockedVoter.ts
new file mode 100644
index 00000000..854022dc
--- /dev/null
+++ b/helpers/dao/programs/lockedVoter.ts
@@ -0,0 +1,22 @@
+import type { AnchorTypes } from '@saberhq/anchor-contrib';
+
+import type { VeHoney as VoterIDL } from '../../types/ve_honey';
+
+export type LockedVoterTypes = AnchorTypes<
+  VoterIDL,
+  {
+    lockerV2: LockerV2Data;
+    escrowV2: EscrowV2Data;
+    lockerWhitelistEntry: LockerWhitelistEntryData;
+  }
+>;
+
+type Accounts = LockedVoterTypes['Accounts'];
+export type LockerV2Data = Accounts['lockerV2'];
+export type EscrowV2Data = Accounts['escrowV2'];
+export type LockerWhitelistEntryData = Accounts['whitelistEntry'];
+
+export type LockerParamsV2 = LockedVoterTypes['Defined']['LockerParamsV2'];
+
+export type LockedVoterError = LockedVoterTypes['Error'];
+export type LockedVoterProgram = LockedVoterTypes['Program'];
diff --git a/helpers/dao/sdk.ts b/helpers/dao/sdk.ts
new file mode 100644
index 00000000..4f2c0b53
--- /dev/null
+++ b/helpers/dao/sdk.ts
@@ -0,0 +1,101 @@
+import type { BN } from '@project-serum/anchor';
+import { newProgramMap } from '@saberhq/anchor-contrib';
+import type { AugmentedProvider, Provider } from '@saberhq/solana-contrib';
+import {
+  SolanaAugmentedProvider,
+  TransactionEnvelope
+} from '@saberhq/solana-contrib';
+import type { PublicKey, Signer } from '@solana/web3.js';
+import { Keypair, SystemProgram } from '@solana/web3.js';
+
+import type { TribecaPrograms } from './constants';
+import {
+  DEFAULT_LOCKER_PARAMS,
+  HONEY_DAO_ADDRESSES,
+  HONEY_DAO_IDLS
+} from './constants';
+import type { LockerParamsV2 } from './programs/lockedVoter';
+import { GovernWrapper } from './wrappers';
+import { findLockerAddress } from './wrappers/lockedVoter/pda';
+
+/**
+ * TribecaSDK.
+ */
+export class TribecaSDK {
+  constructor(
+    readonly provider: AugmentedProvider,
+    readonly programs: TribecaPrograms
+  ) {}
+
+  /**
+   * Creates a new instance of the SDK with the given keypair.
+   */
+  withSigner(signer: Signer): TribecaSDK {
+    return TribecaSDK.load({
+      provider: this.provider.withSigner(signer)
+    });
+  }
+
+  /**
+   * Loads the SDK.
+   * @returns
+   */
+  static load({ provider }: { provider: Provider }): TribecaSDK {
+    const programs: TribecaPrograms = newProgramMap<TribecaPrograms>(
+      provider,
+      HONEY_DAO_IDLS,
+      HONEY_DAO_ADDRESSES
+    );
+    return new TribecaSDK(new SolanaAugmentedProvider(provider), programs);
+  }
+
+  /**
+   * Govern program helpers.
+   */
+  get govern(): GovernWrapper {
+    return new GovernWrapper(this);
+  }
+
+  /**
+   * Creates a Locker, which is an Electorate that supports vote locking.
+   * @returns
+   */
+  async createLocker({
+    governor,
+    govTokenMint,
+    baseKP = Keypair.generate(),
+    ...providedLockerParams
+  }: {
+    baseKP?: Keypair;
+    governor: PublicKey;
+    govTokenMint: PublicKey;
+  } & Partial<LockerParamsV2>): Promise<{
+    locker: PublicKey;
+    tx: TransactionEnvelope;
+  }> {
+    const [locker] = await findLockerAddress(baseKP.publicKey);
+    const lockerParams = {
+      ...DEFAULT_LOCKER_PARAMS,
+      ...providedLockerParams
+    };
+    return {
+      locker,
+      tx: new TransactionEnvelope(
+        this.provider,
+        [
+          this.programs.LockedVoter.instruction.initLockerV2(lockerParams, {
+            accounts: {
+              base: baseKP.publicKey,
+              governor,
+              locker,
+              tokenMint: govTokenMint,
+              payer: this.provider.wallet.publicKey,
+              systemProgram: SystemProgram.programId
+            }
+          })
+        ],
+        [baseKP]
+      )
+    };
+  }
+}
diff --git a/helpers/dao/wrappers/govern/govern.ts b/helpers/dao/wrappers/govern/govern.ts
new file mode 100644
index 00000000..c422dccf
--- /dev/null
+++ b/helpers/dao/wrappers/govern/govern.ts
@@ -0,0 +1,71 @@
+import { TransactionEnvelope } from "@saberhq/solana-contrib";
+import type { PublicKey } from "@solana/web3.js";
+import { Keypair, SystemProgram } from "@solana/web3.js";
+import type BN from "bn.js";
+
+import { DEFAULT_GOVERNANCE_PARAMETERS } from "../..";
+import type { GovernProgram, VoteData } from "../../programs/govern";
+import type { TribecaSDK } from "../../sdk";
+import { GovernorWrapper } from "./governor";
+import { findGovernorAddress } from "./pda";
+import type { PendingGovernor } from "./types";
+
+export class GovernWrapper {
+  readonly program: GovernProgram;
+
+  constructor(readonly sdk: TribecaSDK) {
+    this.program = sdk.programs.Govern;
+  }
+
+  get provider() {
+    return this.sdk.provider;
+  }
+
+  async fetchVote(key: PublicKey): Promise<VoteData> {
+    return await this.program.account.vote.fetch(key);
+  }
+
+  async createGovernor({
+    electorate,
+    smartWallet,
+    baseKP = Keypair.generate(),
+    ...governorParams
+  }: {
+    electorate: PublicKey;
+    smartWallet: PublicKey;
+    baseKP?: Keypair;
+    quorumVotes?: BN;
+    votingDelay?: BN;
+    votingPeriod?: BN;
+    smartWalletOwner?: PublicKey;
+  }): Promise<PendingGovernor> {
+    const [governor, bump] = await findGovernorAddress(baseKP.publicKey);
+    const wrapper = new GovernorWrapper(this.sdk, governor);
+    return {
+      wrapper,
+      tx: new TransactionEnvelope(
+        this.provider,
+        [
+          this.sdk.programs.Govern.instruction.createGovernor(
+            bump,
+            electorate,
+            {
+              ...DEFAULT_GOVERNANCE_PARAMETERS,
+              ...governorParams,
+            },
+            {
+              accounts: {
+                base: baseKP.publicKey,
+                governor,
+                smartWallet,
+                payer: this.provider.wallet.publicKey,
+                systemProgram: SystemProgram.programId,
+              },
+            }
+          ),
+        ],
+        [baseKP]
+      ),
+    };
+  }
+}
diff --git a/helpers/dao/wrappers/govern/governor.ts b/helpers/dao/wrappers/govern/governor.ts
new file mode 100644
index 00000000..6cc3ac25
--- /dev/null
+++ b/helpers/dao/wrappers/govern/governor.ts
@@ -0,0 +1,280 @@
+import {
+  findTransactionAddress,
+  GOKI_ADDRESSES,
+  GOKI_CODERS,
+} from "@gokiprotocol/client";
+import { TransactionEnvelope } from "@saberhq/solana-contrib";
+import { u64 } from "@saberhq/token-utils";
+import type { PublicKey, TransactionInstruction } from "@solana/web3.js";
+import { SystemProgram } from "@solana/web3.js";
+import type BN from "bn.js";
+
+import type {
+  GovernanceParameters,
+  GovernorData,
+  ProposalData,
+  ProposalInstruction,
+  ProposalMetaData,
+} from "../../programs/govern";
+import type { TribecaSDK } from "../../sdk";
+import type { PendingProposal } from "../simpleVoter/types";
+import {
+  findProposalAddress,
+  findProposalMetaAddress,
+  findVoteAddress,
+} from "./pda";
+
+/**
+ * Wrapper around a Governor.
+ */
+export class GovernorWrapper {
+  private _governor: GovernorData | null = null;
+
+  constructor(readonly sdk: TribecaSDK, readonly governorKey: PublicKey) {}
+
+  get provider() {
+    return this.sdk.provider;
+  }
+
+  get program() {
+    return this.sdk.programs.Govern;
+  }
+
+  async reload(): Promise<GovernorData> {
+    return await this.program.account.governor.fetch(this.governorKey);
+  }
+
+  async data(): Promise<GovernorData> {
+    if (!this._governor) {
+      this._governor = await this.reload();
+    }
+    return this._governor;
+  }
+
+  async findProposalAddress(index: BN): Promise<PublicKey> {
+    const [key] = await findProposalAddress(this.governorKey, index);
+    return key;
+  }
+
+  async fetchProposalByKey(key: PublicKey): Promise<ProposalData> {
+    return await this.program.account.proposal.fetch(key);
+  }
+
+  async fetchProposal(index: BN): Promise<ProposalData> {
+    const key = await this.findProposalAddress(index);
+    return await this.fetchProposalByKey(key);
+  }
+
+  async fetchProposalMeta(proposalKey: PublicKey): Promise<ProposalMetaData> {
+    const [key] = await findProposalMetaAddress(proposalKey);
+    return await this.program.account.proposalMeta.fetch(key);
+  }
+
+  /**
+   * Creates a ProposalMeta for a proposal.
+   * Only the Proposer may call this.
+   *
+   * @returns
+   */
+  async createProposalMeta({
+    proposal,
+    proposer = this.sdk.provider.wallet.publicKey,
+    title,
+    descriptionLink,
+  }: {
+    proposal: PublicKey;
+    proposer?: PublicKey;
+    title: string;
+    descriptionLink: string;
+  }): Promise<TransactionEnvelope> {
+    const [proposalMetaKey, bump] = await findProposalMetaAddress(proposal);
+    const ix = this.sdk.programs.Govern.instruction.createProposalMeta(
+      bump,
+      title,
+      descriptionLink,
+      {
+        accounts: {
+          proposal,
+          proposer,
+          proposalMeta: proposalMetaKey,
+          payer: this.provider.wallet.publicKey,
+          systemProgram: SystemProgram.programId,
+        },
+      }
+    );
+    return this.provider.newTX([ix]);
+  }
+
+  /**
+   * Creates a new Proposal.
+   * @returns
+   */
+  async createProposal({
+    proposer = this.sdk.provider.wallet.publicKey,
+    instructions,
+  }: {
+    proposer?: PublicKey;
+    instructions: ProposalInstruction[];
+  }): Promise<PendingProposal> {
+    const { provider } = this.sdk;
+
+    const governorData = await this.reload();
+    const index = new u64(governorData.proposalCount);
+    const [proposal, bump] = await findProposalAddress(this.governorKey, index);
+
+    const ixs: TransactionInstruction[] = [];
+
+    ixs.push(
+      this.sdk.programs.Govern.instruction.createProposal(bump, instructions, {
+        accounts: {
+          governor: this.governorKey,
+          proposal,
+          proposer,
+          payer: provider.wallet.publicKey,
+          systemProgram: SystemProgram.programId,
+        },
+      })
+    );
+
+    return {
+      proposal,
+      index,
+      tx: this.provider.newTX(ixs),
+    };
+  }
+
+  /**
+   * Queues a Proposal for execution by the Smart Wallet.
+   * @returns
+   */
+  async queueProposal({
+    index,
+    smartWalletProgram = GOKI_ADDRESSES.SmartWallet,
+    payer = this.provider.wallet.publicKey,
+  }: {
+    index: BN;
+    smartWalletProgram?: PublicKey;
+    payer?: PublicKey;
+  }): Promise<TransactionEnvelope> {
+    const governorData = await this.data();
+
+    const [proposal] = await findProposalAddress(this.governorKey, index);
+    const smartWalletDataRaw =
+      await this.program.provider.connection.getAccountInfo(
+        governorData.smartWallet
+      );
+    if (!smartWalletDataRaw) {
+      throw new Error("smart wallet not found");
+    }
+    const smartWalletData = GOKI_CODERS.SmartWallet.accountParsers.smartWallet(
+      smartWalletDataRaw.data
+    );
+    const [txKey, txBump] = await findTransactionAddress(
+      governorData.smartWallet,
+      smartWalletData.numTransactions.toNumber()
+    );
+    return new TransactionEnvelope(this.sdk.provider, [
+      this.program.instruction.queueProposal(txBump, {
+        accounts: {
+          governor: this.governorKey,
+          proposal,
+          smartWallet: governorData.smartWallet,
+          smartWalletProgram,
+          transaction: txKey,
+          payer,
+          systemProgram: SystemProgram.programId,
+        },
+      }),
+    ]);
+  }
+
+  /**
+   * Cancel a new Proposal.
+   * @returns
+   */
+  cancelProposal({
+    proposal,
+    proposer = this.sdk.provider.wallet.publicKey,
+  }: {
+    proposal: PublicKey;
+    proposer?: PublicKey;
+  }): TransactionEnvelope {
+    return new TransactionEnvelope(this.sdk.provider, [
+      this.sdk.programs.Govern.instruction.cancelProposal({
+        accounts: {
+          governor: this.governorKey,
+          proposal,
+          proposer,
+        },
+      }),
+    ]);
+  }
+
+  async getOrCreateVote({
+    proposal,
+    voter = this.sdk.provider.wallet.publicKey,
+    payer = this.sdk.provider.wallet.publicKey,
+  }: {
+    proposal: PublicKey;
+    voter?: PublicKey;
+    payer?: PublicKey;
+  }): Promise<{
+    voteKey: PublicKey;
+    instruction: TransactionInstruction | null;
+  }> {
+    const [voteKey, bump] = await findVoteAddress(proposal, voter);
+
+    try {
+      await this.program.account.vote.fetch(voteKey);
+      return { voteKey, instruction: null };
+    } catch {
+      return {
+        voteKey,
+        instruction: await this.createVoteIx({
+          proposal,
+          voteKeyAndBump: [voteKey, bump],
+          voter,
+          payer,
+        }),
+      };
+    }
+  }
+
+  async createVoteIx({
+    proposal,
+    voteKeyAndBump,
+    voter = this.sdk.provider.wallet.publicKey,
+    payer = this.sdk.provider.wallet.publicKey,
+  }: {
+    proposal: PublicKey;
+    voteKeyAndBump?: [PublicKey, number];
+    voter?: PublicKey;
+    payer?: PublicKey;
+  }): Promise<TransactionInstruction> {
+    if (!voteKeyAndBump) {
+      voteKeyAndBump = await findVoteAddress(proposal, voter);
+    }
+
+    const [voteKey, bump] = voteKeyAndBump;
+    return this.program.instruction.newVote(bump, voter, {
+      accounts: {
+        vote: voteKey,
+        proposal,
+        payer,
+        systemProgram: SystemProgram.programId,
+      },
+    });
+  }
+
+  async setGovernanceParamsIx(
+    newParams: GovernanceParameters
+  ): Promise<TransactionInstruction> {
+    const { smartWallet } = await this.data();
+    return this.program.instruction.setGovernanceParams(newParams, {
+      accounts: {
+        governor: this.governorKey,
+        smartWallet,
+      },
+    });
+  }
+}
diff --git a/helpers/dao/wrappers/govern/index.ts b/helpers/dao/wrappers/govern/index.ts
new file mode 100644
index 00000000..4451c6c3
--- /dev/null
+++ b/helpers/dao/wrappers/govern/index.ts
@@ -0,0 +1,6 @@
+export * from "./govern";
+export * from "./governor";
+export * from "./pda";
+export * from "./proposal";
+export * from "./setup";
+export * from "./types";
diff --git a/helpers/dao/wrappers/govern/pda.ts b/helpers/dao/wrappers/govern/pda.ts
new file mode 100644
index 00000000..3cc110a7
--- /dev/null
+++ b/helpers/dao/wrappers/govern/pda.ts
@@ -0,0 +1,68 @@
+import { utils } from '@project-serum/anchor';
+import type { u64 } from '@saberhq/token-utils';
+import { PublicKey } from '@solana/web3.js';
+
+import { HONEY_DAO_ADDRESSES } from '../../constants';
+
+/**
+ * Finds the PDA of a Governor.
+ */
+export const findGovernorAddress = async (
+  base: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [utils.bytes.utf8.encode('TribecaGovernor'), base.toBuffer()],
+    HONEY_DAO_ADDRESSES.Govern
+  );
+};
+
+/**
+ * Finds the PDA of a Proposal.
+ */
+export const findProposalAddress = async (
+  governorKey: PublicKey,
+  index: u64
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [
+      utils.bytes.utf8.encode('TribecaProposal'),
+      governorKey.toBuffer(),
+      index.toArrayLike(Buffer, 'le', 8)
+    ],
+    HONEY_DAO_ADDRESSES.Govern
+  );
+};
+
+/**
+ * Finds the PDA of a Vote.
+ * @param proposalKey
+ * @param voterKey
+ * @returns
+ */
+export const findVoteAddress = async (
+  proposalKey: PublicKey,
+  voterKey: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [
+      utils.bytes.utf8.encode('TribecaVote'),
+      proposalKey.toBuffer(),
+      voterKey.toBuffer()
+    ],
+    HONEY_DAO_ADDRESSES.Govern
+  );
+};
+
+/**
+ * Finds the address of a ProposalMeta.
+ * @param proposalKey
+ * @returns
+ */
+export const findProposalMetaAddress = async (
+  proposalKey: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [utils.bytes.utf8.encode('TribecaProposalMeta'), proposalKey.toBuffer()],
+    HONEY_DAO_ADDRESSES.Govern
+  );
+};
diff --git a/helpers/dao/wrappers/govern/proposal.ts b/helpers/dao/wrappers/govern/proposal.ts
new file mode 100644
index 00000000..fdafb86a
--- /dev/null
+++ b/helpers/dao/wrappers/govern/proposal.ts
@@ -0,0 +1,35 @@
+import BN from 'bn.js';
+
+import type { ProposalData } from '../../programs/govern';
+import { ProposalState } from './types';
+
+/**
+ * Gets the state of a proposal.
+ * @returns
+ */
+export const getProposalState = ({
+  proposalData,
+  currentTimeSeconds = Math.floor(new Date().getTime() / 1_000)
+}: {
+  proposalData: ProposalData;
+  currentTimeSeconds?: number;
+}): ProposalState => {
+  if (proposalData.canceledAt.gt(new BN(0))) {
+    return ProposalState.Canceled;
+  } else if (proposalData.activatedAt.eq(new BN(0))) {
+    return ProposalState.Draft;
+  } else if (proposalData.votingEndsAt.gte(new BN(currentTimeSeconds))) {
+    return ProposalState.Active;
+  } else if (
+    proposalData.forVotes.lte(proposalData.againstVotes) ||
+    proposalData.forVotes
+      .add(proposalData.abstainVotes)
+      .add(proposalData.againstVotes)
+      .lt(proposalData.quorumVotes)
+  ) {
+    return ProposalState.Defeated;
+  } else if (proposalData.queuedAt.gt(new BN(0))) {
+    return ProposalState.Queued;
+  }
+  return ProposalState.Succeeded;
+};
diff --git a/helpers/dao/wrappers/govern/setup.ts b/helpers/dao/wrappers/govern/setup.ts
new file mode 100644
index 00000000..5c4dc8a0
--- /dev/null
+++ b/helpers/dao/wrappers/govern/setup.ts
@@ -0,0 +1,95 @@
+import type { GokiSDK, SmartWalletWrapper } from "@gokiprotocol/client";
+import type { TransactionEnvelope } from "@saberhq/solana-contrib";
+import type { PublicKey } from "@solana/web3.js";
+import { Keypair } from "@solana/web3.js";
+import BN from "bn.js";
+
+import type { GovernanceParameters, TribecaSDK } from "../..";
+import { DEFAULT_GOVERNANCE_PARAMETERS } from "../..";
+import type { GovernorWrapper } from "..";
+import { findGovernorAddress } from "..";
+
+/**
+ * Creates a Governor.
+ * @returns
+ */
+export const createGovernorWithElectorate = async ({
+  createElectorate,
+  sdk,
+  gokiSDK,
+  owners = [sdk.provider.wallet.publicKey],
+  governanceParameters = DEFAULT_GOVERNANCE_PARAMETERS,
+  govBaseKP = Keypair.generate(),
+  smartWalletBaseKP = Keypair.generate(),
+}: {
+  createElectorate: (
+    governor: PublicKey
+  ) => Promise<{ key: PublicKey; tx: TransactionEnvelope }>;
+  sdk: TribecaSDK;
+  gokiSDK: GokiSDK;
+  owners?: PublicKey[];
+  governanceParameters?: Partial<GovernanceParameters>;
+  /**
+   * Base of the governor.
+   */
+  govBaseKP?: Keypair;
+  /**
+   * Base of the smart wallet.
+   */
+  smartWalletBaseKP?: Keypair;
+}): Promise<{
+  governorWrapper: GovernorWrapper;
+  smartWalletWrapper: SmartWalletWrapper;
+  electorate: PublicKey;
+  createTXs: {
+    title: string;
+    tx: TransactionEnvelope;
+  }[];
+}> => {
+  const [governor] = await findGovernorAddress(govBaseKP.publicKey);
+
+  const createTXs: {
+    title: string;
+    tx: TransactionEnvelope;
+  }[] = [];
+
+  const { smartWalletWrapper, tx: tx1 } = await gokiSDK.newSmartWallet({
+    owners: [...owners, governor],
+    threshold: new BN(2),
+    numOwners: 3,
+    base: smartWalletBaseKP,
+  });
+  createTXs.push({
+    title: "Create Smart Wallet",
+    tx: tx1,
+  });
+
+  const { key: electorate, tx: createElectorateTX } = await createElectorate(
+    governor
+  );
+
+  const { wrapper: governorWrapper, tx: tx2 } = await sdk.govern.createGovernor(
+    {
+      ...governanceParameters,
+      baseKP: govBaseKP,
+      electorate,
+      smartWallet: smartWalletWrapper.key,
+    }
+  );
+  createTXs.push({
+    title: "Create Governor",
+    tx: tx2,
+  });
+
+  createTXs.push({
+    title: "Create Electorate",
+    tx: createElectorateTX,
+  });
+
+  return {
+    governorWrapper,
+    smartWalletWrapper,
+    createTXs,
+    electorate,
+  };
+};
diff --git a/helpers/dao/wrappers/govern/types.ts b/helpers/dao/wrappers/govern/types.ts
new file mode 100644
index 00000000..0812353e
--- /dev/null
+++ b/helpers/dao/wrappers/govern/types.ts
@@ -0,0 +1,97 @@
+import type { TransactionEnvelope } from "@saberhq/solana-contrib";
+import type { PublicKey } from "@solana/web3.js";
+
+import type { GovernorWrapper } from "./governor";
+
+export type PendingGovernor = {
+  wrapper: GovernorWrapper;
+  tx: TransactionEnvelope;
+};
+
+export type WhitelistArgs = {
+  canPropose: boolean;
+  activator: PublicKey;
+  smartWalletOwner?: PublicKey;
+};
+
+/**
+ * State of a proposal.
+ */
+export enum ProposalState {
+  /*
+   * Anyone can create a proposal on Tribeca. When a governance proposal is created,
+   * it is considered a [ProposalState::Draft] and enters a review period, after which voting weights
+   * are recorded and voting begins.
+   */
+  Draft,
+  /*
+   * Each DAO has requirements for who can activate proposals; a common way
+   * is to require the user to have a minimum amount of tokens.
+   * An [ProposalState::Active] proposal is one that is surfaced to the community to put up for voting.
+   */
+  Active,
+  /*
+   * If a proposal is still a [ProposalState::Draft], a proposal may be canceled by its creator.
+   * A canceled proposal cannot be reactivated; it simply just exists as a record.
+   */
+  Canceled,
+  /*
+   * After the voting period ends, votes are tallied up. A proposal is [ProposalState::Defeated] if one of
+   * two scenarios happen:
+   * - More or equal votes are [VoteSide::Against] than [VoteSide::For].
+   * - The sum of all votes does not meet quorum.
+   */
+  Defeated,
+  /*
+   * A proposal is [ProposalState::Succeeded] if it is not defeated and voting is over.
+   */
+  Succeeded,
+  /*
+   * A succeeded proposal may be [ProposalState::Queued] into the [SmartWallet].
+   */
+  Queued,
+}
+
+/**
+ * Labels for proposal states.
+ */
+export const PROPOSAL_STATE_LABELS: { [K in ProposalState]: string } = {
+  [ProposalState.Active]: "Active",
+  [ProposalState.Draft]: "Draft",
+  [ProposalState.Canceled]: "Canceled",
+  [ProposalState.Defeated]: "Defeated",
+  [ProposalState.Succeeded]: "Succeeded",
+  [ProposalState.Queued]: "Queued",
+} as const;
+
+/**
+ * Side of a vote.
+ */
+export enum VoteSide {
+  /**
+   * A vote that has not been set or has been unset.
+   */
+  Pending = 0,
+  /**
+   * Vote against the passing of the proposal.
+   */
+  Against = 1,
+  /**
+   * Vote to make the proposal pass.
+   */
+  For = 2,
+  /**
+   * This vote does not count as a `For` or `Against`, but it still contributes to quorum.
+   */
+  Abstain = 3,
+}
+
+/**
+ * Labels for vote sides.
+ */
+export const VOTE_SIDE_LABELS: { [K in VoteSide]: string } = {
+  [VoteSide.For]: "For",
+  [VoteSide.Against]: "Against",
+  [VoteSide.Abstain]: "Abstain",
+  [VoteSide.Pending]: "Pending",
+};
diff --git a/helpers/dao/wrappers/index.ts b/helpers/dao/wrappers/index.ts
new file mode 100644
index 00000000..ed9900ed
--- /dev/null
+++ b/helpers/dao/wrappers/index.ts
@@ -0,0 +1,2 @@
+export * from './govern';
+export * from './lockedVoter';
diff --git a/helpers/dao/wrappers/lockedVoter/escrow.ts b/helpers/dao/wrappers/lockedVoter/escrow.ts
new file mode 100644
index 00000000..467d32da
--- /dev/null
+++ b/helpers/dao/wrappers/lockedVoter/escrow.ts
@@ -0,0 +1,231 @@
+import type { TransactionEnvelope } from '@saberhq/solana-contrib';
+import type { TokenAmount } from '@saberhq/token-utils';
+import {
+  getATAAddress,
+  getOrCreateATA,
+  TOKEN_PROGRAM_ID
+} from '@saberhq/token-utils';
+import type { PublicKey, TransactionInstruction } from '@solana/web3.js';
+import { SystemProgram } from '@solana/web3.js';
+import BN from 'bn.js';
+
+import { HONEY_DAO_ADDRESSES } from '../../constants';
+import type { EscrowV2Data, LockerV2Data } from '../../programs/lockedVoter';
+import type { TribecaSDK } from '../../sdk';
+import { findVoteAddress } from '../govern/pda';
+import type { VoteSide } from '../govern/types';
+
+export class VoteEscrow {
+  private _lockerData: LockerV2Data | null = null;
+  private _escrowData: EscrowV2Data | null = null;
+
+  constructor(
+    readonly sdk: TribecaSDK,
+    readonly locker: PublicKey,
+    readonly governorKey: PublicKey,
+    readonly escrowKey: PublicKey,
+    readonly owner: PublicKey
+  ) {}
+
+  get provider() {
+    return this.sdk.provider;
+  }
+
+  get lockerProgram() {
+    return this.sdk.programs.LockedVoter;
+  }
+
+  /**
+   * Locker data.
+   */
+  async lockerData() {
+    if (!this._lockerData) {
+      this._lockerData = await this.lockerProgram.account.lockerV2.fetch(
+        this.locker
+      );
+    }
+    return this._lockerData;
+  }
+
+  /**
+   * Escrow data.
+   */
+  async data() {
+    if (!this._escrowData) {
+      this._escrowData = await this.lockerProgram.account.escrowV2.fetch(
+        this.escrowKey
+      );
+    }
+    return this._escrowData;
+  }
+
+  /**
+   * Creates a function to calculate the voting power of this escrow.
+   * @returns
+   */
+  async makeCalculateVotingPower(): Promise<(timestampSeconds: number) => BN> {
+    const escrowData = await this.data();
+    const lockerData = await this.lockerData();
+    return (timestampSeconds: number) => {
+      if (escrowData.escrowStartedAt.eq(new BN(0))) {
+        return new BN(0);
+      }
+      if (
+        timestampSeconds < escrowData.escrowStartedAt.toNumber() ||
+        timestampSeconds >= escrowData.escrowEndsAt.toNumber()
+      ) {
+        return new BN(0);
+      }
+      const secondsUntilLockupExpiry = escrowData.escrowEndsAt
+        .sub(new BN(timestampSeconds))
+        .toNumber();
+      const relevantSecondsUntilLockupExpiry = Math.min(
+        secondsUntilLockupExpiry,
+        lockerData.params.maxStakeDuration.toNumber()
+      );
+      const powerIfMaxLockup = escrowData.amount.mul(
+        new BN(lockerData.params.multiplier)
+      );
+      return powerIfMaxLockup
+        .mul(new BN(relevantSecondsUntilLockupExpiry))
+        .div(lockerData.params.maxStakeDuration);
+    };
+  }
+
+  /**
+   * Calculates the voting power of this escrow.
+   * @param time Optional time to calculate power for.
+   * @returns
+   */
+  async calculateVotingPower(time: Date = new Date()): Promise<BN> {
+    return (await this.makeCalculateVotingPower())(
+      Math.floor(time.getTime() / 1_000)
+    );
+  }
+
+  /**
+   * Activates a proposal.
+   * @returns
+   */
+  activateProposal(proposal: PublicKey): TransactionEnvelope {
+    return this.provider.newTX([
+      this.lockerProgram.instruction.activateProposal({
+        accounts: {
+          locker: this.locker,
+          governor: this.governorKey,
+          proposal,
+          escrow: this.escrowKey,
+          escrowOwner: this.owner,
+          governProgram: HONEY_DAO_ADDRESSES.Govern
+        }
+      })
+    ]);
+  }
+
+  /**
+   * Casts a vote on a proposal.
+   * @returns
+   */
+  async castVote({
+    proposal,
+    side
+  }: {
+    proposal: PublicKey;
+    side: VoteSide;
+  }): Promise<TransactionEnvelope> {
+    const [voteKey, voteBump] = await findVoteAddress(proposal, this.owner);
+    const vote = await this.provider.getAccountInfo(voteKey);
+    let createVoteIX: TransactionInstruction | null = null;
+    if (!vote) {
+      createVoteIX = this.sdk.programs.Govern.instruction.newVote(
+        voteBump,
+        this.owner,
+        {
+          accounts: {
+            proposal,
+            vote: voteKey,
+            payer: this.provider.wallet.publicKey,
+            systemProgram: SystemProgram.programId
+          }
+        }
+      );
+    }
+    return this.provider.newTX([
+      createVoteIX,
+      this.lockerProgram.instruction.castVote(side, {
+        accounts: {
+          locker: this.locker,
+          escrow: this.escrowKey,
+          voteDelegate: this.owner,
+          proposal,
+          vote: voteKey,
+          governor: this.governorKey,
+          governProgram: HONEY_DAO_ADDRESSES.Govern
+        }
+      })
+    ]);
+  }
+
+  /**
+   * Locks tokens into the escrow.
+   * @param amount
+   * @param durationSeconds The duration of the lock, in seconds
+   * @param authority
+   * @returns
+   */
+  async lock(
+    amount: TokenAmount,
+    durationSeconds: number
+  ): Promise<TransactionEnvelope> {
+    const escrowData = await this.data();
+    const sourceTokens = await getATAAddress({
+      mint: amount.token.mintAccount,
+      owner: escrowData.owner
+    });
+    return this.provider.newTX([
+      this.lockerProgram.instruction.lockV2(
+        amount.toU64(),
+        new BN(durationSeconds),
+        {
+          accounts: {
+            locker: this.locker,
+            escrow: this.escrowKey,
+            lockedTokens: escrowData.tokens,
+            escrowOwner: escrowData.owner,
+            sourceTokens,
+            sourceTokensAuthority: this.owner,
+            tokenProgram: TOKEN_PROGRAM_ID
+          }
+        }
+      )
+    ]);
+  }
+
+  /**
+   * Exits the escrow.
+   * @returns
+   */
+  async exit(): Promise<TransactionEnvelope> {
+    const lockerData = await this.lockerData();
+    const escrowData = await this.data();
+    const destinationTokens = await getOrCreateATA({
+      provider: this.provider,
+      mint: lockerData.tokenMint,
+      owner: escrowData.owner
+    });
+    return this.provider.newTX([
+      destinationTokens.instruction,
+      this.lockerProgram.instruction.exitV2({
+        accounts: {
+          locker: this.locker,
+          escrow: this.escrowKey,
+          escrowOwner: escrowData.owner,
+          lockedTokens: escrowData.tokens,
+          destinationTokens: destinationTokens.address,
+          payer: this.provider.wallet.publicKey,
+          tokenProgram: TOKEN_PROGRAM_ID
+        }
+      })
+    ]);
+  }
+}
diff --git a/helpers/dao/wrappers/lockedVoter/index.ts b/helpers/dao/wrappers/lockedVoter/index.ts
new file mode 100644
index 00000000..29746bba
--- /dev/null
+++ b/helpers/dao/wrappers/lockedVoter/index.ts
@@ -0,0 +1,4 @@
+export * from "./escrow";
+export * from "./locker";
+export * from "./pda";
+export * from "./setup";
diff --git a/helpers/dao/wrappers/lockedVoter/locker.ts b/helpers/dao/wrappers/lockedVoter/locker.ts
new file mode 100644
index 00000000..832cd9a1
--- /dev/null
+++ b/helpers/dao/wrappers/lockedVoter/locker.ts
@@ -0,0 +1,452 @@
+import type { BN } from '@project-serum/anchor';
+import {
+  createMemoInstruction,
+  TransactionEnvelope
+} from '@saberhq/solana-contrib';
+import { getOrCreateATA, TOKEN_PROGRAM_ID } from '@saberhq/token-utils';
+import type { TransactionInstruction } from '@solana/web3.js';
+import {
+  PublicKey,
+  SystemProgram,
+  SYSVAR_INSTRUCTIONS_PUBKEY
+} from '@solana/web3.js';
+import invariant from 'tiny-invariant';
+
+import { HONEY_DAO_ADDRESSES } from '../../constants';
+import type {
+  EscrowV2Data,
+  LockedVoterProgram,
+  LockerV2Data,
+  LockerParamsV2,
+  ProposalData
+} from '../../programs';
+import type { TribecaSDK } from '../../sdk';
+import type { VoteSide } from '../govern/types';
+import { GovernorWrapper } from '../govern/governor';
+import { findWhitelistAddress } from '.';
+import { findEscrowAddress } from './pda';
+
+/**
+ * Helper methods around a Locked Voter electorate.
+ */
+export class LockerWrapper {
+  readonly program: LockedVoterProgram;
+  readonly governor: GovernorWrapper;
+
+  private _lockerData: LockerV2Data | null = null;
+
+  constructor(
+    readonly sdk: TribecaSDK,
+    readonly locker: PublicKey,
+    readonly governorKey: PublicKey
+  ) {
+    this.program = sdk.programs.LockedVoter;
+    this.governor = new GovernorWrapper(sdk, governorKey);
+  }
+
+  static async load(
+    sdk: TribecaSDK,
+    lockerKey: PublicKey,
+    governorKey: PublicKey
+  ): Promise<LockerWrapper> {
+    const wrapper = new LockerWrapper(sdk, lockerKey, governorKey);
+    await wrapper.data();
+    return wrapper;
+  }
+
+  /**
+   * Fetches the data of the locker.
+   * @returns
+   */
+  async reload(): Promise<LockerV2Data> {
+    return this.program.account.lockerV2.fetch(this.locker);
+  }
+
+  async fetchProposalData(proposalKey: PublicKey): Promise<ProposalData> {
+    return await this.sdk.govern.program.account.proposal.fetch(proposalKey);
+  }
+
+  async fetchEscrow(escrowKey: PublicKey): Promise<EscrowV2Data> {
+    return await this.program.account.escrowV2.fetch(escrowKey);
+  }
+
+  async fetchEscrowByAuthority(
+    authority: PublicKey = this.sdk.provider.wallet.publicKey
+  ): Promise<EscrowV2Data> {
+    const [escrowKey] = await findEscrowAddress(this.locker, authority);
+    return this.fetchEscrow(escrowKey);
+  }
+
+  /**
+   * Fetches the data of the locker.
+   * @returns
+   */
+  async data(): Promise<LockerV2Data> {
+    if (!this._lockerData) {
+      this._lockerData = await this.reload();
+    }
+    return this._lockerData;
+  }
+
+  async getOrCreateEscrow(
+    authority: PublicKey = this.sdk.provider.wallet.publicKey
+  ): Promise<{
+    escrow: PublicKey;
+    instruction: TransactionInstruction | null;
+  }> {
+    const [escrow] = await findEscrowAddress(this.locker, authority);
+    const escrowData = await this.program.account.escrowV2.fetchNullable(
+      escrow
+    );
+    if (escrowData) {
+      return { escrow: escrow, instruction: null };
+    } else {
+      return {
+        escrow: escrow,
+        instruction: await this.newEscrowIX(authority)
+      };
+    }
+  }
+
+  /**
+   * Creates the instruction to build a new Escrow.
+   * @param authority
+   * @returns
+   */
+  async newEscrowIX(
+    authority: PublicKey = this.sdk.provider.wallet.publicKey
+  ): Promise<TransactionInstruction> {
+    const [escrow] = await findEscrowAddress(this.locker, authority);
+    return this.program.instruction.initEscrowV2({
+      accounts: {
+        locker: this.locker,
+        escrow,
+        escrowOwner: authority,
+        payer: this.sdk.provider.wallet.publicKey,
+        systemProgram: SystemProgram.programId
+      }
+    });
+  }
+
+  async activateProposal({
+    proposal,
+    authority = this.sdk.provider.wallet.publicKey
+  }: {
+    proposal: PublicKey;
+    authority?: PublicKey;
+  }): Promise<TransactionEnvelope> {
+    const [escrow] = await findEscrowAddress(this.locker, authority);
+    const ix = this.program.instruction.activateProposal({
+      accounts: {
+        locker: this.locker,
+        governor: this.governorKey,
+        proposal,
+        escrow,
+        escrowOwner: authority,
+        governProgram: HONEY_DAO_ADDRESSES.Govern
+      }
+    });
+    return new TransactionEnvelope(this.sdk.provider, [ix]);
+  }
+
+  async lockTokensV2({
+    amount,
+    duration,
+    authority = this.sdk.provider.wallet.publicKey
+  }: {
+    amount: BN;
+    duration: BN;
+    authority?: PublicKey;
+  }): Promise<TransactionEnvelope> {
+    invariant(this.locker, 'locker not set');
+
+    const { escrow, instruction: initEscrowIx } = await this.getOrCreateEscrow(
+      authority
+    );
+    const { govTokenAccount, govTokenVault, instructions } =
+      await this._getOrCreateGovTokenATAsInternal(authority, escrow);
+    if (initEscrowIx) {
+      instructions.push(initEscrowIx);
+    }
+
+    const lockerData = await this.reload();
+
+    instructions.push(
+      this.program.instruction.lockV2(amount, duration, {
+        accounts: {
+          locker: this.locker,
+          escrow: escrow,
+          escrowOwner: authority,
+          lockedTokens: govTokenVault,
+          sourceTokens: govTokenAccount,
+          sourceTokensAuthority: authority,
+          tokenProgram: TOKEN_PROGRAM_ID
+        },
+        remainingAccounts: lockerData.params.whitelistEnabled
+          ? [
+              {
+                pubkey: SYSVAR_INSTRUCTIONS_PUBKEY,
+                isSigner: false,
+                isWritable: false
+              },
+              {
+                pubkey: PublicKey.default,
+                isSigner: false,
+                isWritable: false
+              }
+            ]
+          : []
+      })
+    );
+
+    return new TransactionEnvelope(this.sdk.provider, instructions);
+  }
+
+  // async lockTokens({
+  //   amount,
+  //   duration,
+  //   authority = this.sdk.provider.wallet.publicKey
+  // }: {
+  //   amount: BN;
+  //   duration: BN;
+  //   authority?: PublicKey;
+  // }): Promise<TransactionEnvelope> {
+  //   invariant(this.locker, 'locker not set');
+
+  //   const { escrow, instruction: initEscrowIx } = await this.getOrCreateEscrow(
+  //     authority
+  //   );
+  //   const { govTokenAccount, govTokenVault, instructions } =
+  //     await this._getOrCreateGovTokenATAsInternal(authority, escrow);
+  //   if (initEscrowIx) {
+  //     instructions.push(initEscrowIx);
+  //   }
+
+  //   const lockerData = await this.reload();
+
+  //   const lockAccounts = {
+  //     locker: this.locker,
+  //     escrow: escrow,
+  //     escrowOwner: authority,
+  //     escrowTokens: govTokenVault,
+  //     sourceTokens: govTokenAccount,
+  //     tokenProgram: TOKEN_PROGRAM_ID
+  //   };
+
+  //   if (lockerData.params.whitelistEnabled) {
+  //     instructions.push(
+  //       this.program.instruction.lockWithWhitelist(amount, duration, {
+  //         accounts: {
+  //           lock: lockAccounts,
+  //           instructionsSysvar: SYSVAR_INSTRUCTIONS_PUBKEY
+  //         }
+  //       })
+  //     );
+  //   } else {
+  //     instructions.push(
+  //       this.program.instruction.lockPermissionless(amount, duration, {
+  //         accounts: lockAccounts
+  //       })
+  //     );
+  //   }
+
+  //   return new TransactionEnvelope(this.sdk.provider, instructions);
+  // }
+
+  async exit({
+    authority = this.sdk.provider.wallet.publicKey
+  }: {
+    authority?: PublicKey;
+  }): Promise<TransactionEnvelope> {
+    invariant(this.locker, 'locker not set');
+
+    const [escrow] = await findEscrowAddress(this.locker, authority);
+    const escrowData = await this.fetchEscrow(escrow);
+    const { govTokenAccount, instructions } =
+      await this._getOrCreateGovTokenATAsInternal(authority, escrow);
+    instructions.push(
+      this.program.instruction.exitV2({
+        accounts: {
+          locker: this.locker,
+          escrow,
+          escrowOwner: authority,
+          lockedTokens: escrowData.tokens,
+          destinationTokens: govTokenAccount,
+          payer: this.sdk.provider.wallet.publicKey,
+          tokenProgram: TOKEN_PROGRAM_ID
+        }
+      })
+    );
+
+    return new TransactionEnvelope(this.sdk.provider, instructions);
+  }
+
+  async castVotes({
+    voteSide,
+    proposal,
+    authority = this.sdk.provider.wallet.publicKey,
+    reason
+  }: {
+    voteSide: VoteSide;
+    proposal: PublicKey;
+    authority?: PublicKey;
+    reason?: string;
+  }): Promise<TransactionEnvelope> {
+    const ixs: TransactionInstruction[] = [];
+
+    const { escrow, instruction: escrowIx } = await this.getOrCreateEscrow(
+      authority
+    );
+    if (escrowIx) {
+      ixs.push(escrowIx);
+    }
+
+    const { voteKey, instruction: createVoteIX } =
+      await this.governor.getOrCreateVote({
+        proposal,
+        voter: authority
+      });
+    if (createVoteIX) {
+      ixs.push(createVoteIX);
+    }
+
+    ixs.push(
+      this.program.instruction.castVote(voteSide, {
+        accounts: {
+          locker: this.locker,
+          escrow: escrow,
+          voteDelegate: authority ?? this.sdk.provider.wallet.publicKey,
+          proposal,
+          vote: voteKey,
+          governor: this.governorKey,
+          governProgram: HONEY_DAO_ADDRESSES.Govern
+        }
+      })
+    );
+
+    if (reason?.length) {
+      ixs.push(createMemoInstruction(reason, [authority]));
+    }
+
+    return new TransactionEnvelope(this.sdk.provider, ixs);
+  }
+
+  // async setVoteDelegate(
+  //   newDelegate: PublicKey,
+  //   authority: PublicKey = this.sdk.provider.wallet.publicKey
+  // ): Promise<TransactionEnvelope> {
+  //   const [escrow] = await findEscrowAddress(this.locker, authority);
+
+  //   return new TransactionEnvelope(this.sdk.provider, [
+  //     this.program.instruction.setVoteDelegate(newDelegate, {
+  //       accounts: {
+  //         escrow,
+  //         escrowOwner: authority
+  //       }
+  //     })
+  //   ]);
+  // }
+
+  async createApproveProgramLockPrivilegeIx(
+    programId: PublicKey,
+    owner: PublicKey | null
+  ): Promise<TransactionInstruction> {
+    const [whitelistEntry, bump] = await findWhitelistAddress(
+      this.locker,
+      programId,
+      owner
+    );
+    const lockerData = await this.reload();
+    const governorData = await this.sdk.programs.Govern.account.governor.fetch(
+      lockerData.governor
+    );
+    return this.program.instruction.approveProgramLockPrivilegeV2({
+      accounts: {
+        locker: this.locker,
+        whitelistEntry,
+        governor: lockerData.governor,
+        smartWallet: governorData.smartWallet,
+        executableId: programId,
+        whitelistedOwner: owner ?? SystemProgram.programId,
+        payer: this.sdk.provider.wallet.publicKey,
+        systemProgram: SystemProgram.programId
+      }
+    });
+  }
+
+  async createRevokeProgramLockPrivilegeIx(
+    programId: PublicKey,
+    owner: PublicKey | null
+  ): Promise<TransactionInstruction> {
+    const [whitelistEntry] = await findWhitelistAddress(
+      this.locker,
+      programId,
+      owner
+    );
+    const lockerData = await this.reload();
+    const governorData = await this.sdk.programs.Govern.account.governor.fetch(
+      lockerData.governor
+    );
+    return this.program.instruction.revokeProgramLockPrivilegeV2({
+      accounts: {
+        locker: this.locker,
+        whitelistEntry,
+        governor: lockerData.governor,
+        smartWallet: governorData.smartWallet,
+        payer: this.sdk.provider.wallet.publicKey
+      }
+    });
+  }
+
+  async setLockerParamsIx(
+    args: LockerParamsV2
+  ): Promise<TransactionInstruction> {
+    const lockerData = await this.reload();
+    const governorData = await this.sdk.programs.Govern.account.governor.fetch(
+      lockerData.governor
+    );
+
+    return this.program.instruction.setLockerParamsV2(args, {
+      accounts: {
+        locker: this.locker,
+        governor: lockerData.governor,
+        smartWallet: governorData.smartWallet
+      }
+    });
+  }
+
+  private async _getOrCreateGovTokenATAsInternal(
+    authority: PublicKey,
+    escrow: PublicKey
+  ): Promise<{
+    govTokenAccount: PublicKey;
+    govTokenVault: PublicKey;
+    instructions: TransactionInstruction[];
+  }> {
+    const { provider } = this.sdk;
+    const lockerData = await this.data();
+
+    const { address: govTokenAccount, instruction: ix1 } = await getOrCreateATA(
+      {
+        provider,
+        mint: lockerData.tokenMint,
+        owner: authority,
+        payer: authority
+      }
+    );
+    const { address: govTokenVault, instruction: ix2 } = await getOrCreateATA({
+      provider,
+      mint: lockerData.tokenMint,
+      owner: escrow,
+      payer: authority
+    });
+
+    return {
+      govTokenAccount,
+      govTokenVault,
+      instructions: [ix1, ix2].filter(
+        (ix): ix is TransactionInstruction => !!ix
+      )
+    };
+  }
+}
diff --git a/helpers/dao/wrappers/lockedVoter/pda.ts b/helpers/dao/wrappers/lockedVoter/pda.ts
new file mode 100644
index 00000000..aa761bff
--- /dev/null
+++ b/helpers/dao/wrappers/lockedVoter/pda.ts
@@ -0,0 +1,43 @@
+import { utils } from '@project-serum/anchor';
+import { PublicKey, SystemProgram } from '@solana/web3.js';
+
+import { HONEY_DAO_ADDRESSES } from '../../constants';
+
+export const findLockerAddress = async (
+  base: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [utils.bytes.utf8.encode('Locker'), base.toBuffer()],
+    HONEY_DAO_ADDRESSES.LockedVoter
+  );
+};
+
+export const findEscrowAddress = async (
+  locker: PublicKey,
+  authority: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [
+      utils.bytes.utf8.encode('Escrow'),
+      locker.toBuffer(),
+      authority.toBuffer()
+    ],
+    HONEY_DAO_ADDRESSES.LockedVoter
+  );
+};
+
+export const findWhitelistAddress = async (
+  locker: PublicKey,
+  programId: PublicKey,
+  owner: PublicKey | null
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [
+      utils.bytes.utf8.encode('LockerWhitelistEntry'),
+      locker.toBuffer(),
+      programId.toBuffer(),
+      owner ? owner.toBuffer() : SystemProgram.programId.toBuffer()
+    ],
+    HONEY_DAO_ADDRESSES.LockedVoter
+  );
+};
diff --git a/helpers/dao/wrappers/lockedVoter/setup.ts b/helpers/dao/wrappers/lockedVoter/setup.ts
new file mode 100644
index 00000000..89120f50
--- /dev/null
+++ b/helpers/dao/wrappers/lockedVoter/setup.ts
@@ -0,0 +1,89 @@
+import type { GokiSDK, SmartWalletWrapper } from "@gokiprotocol/client";
+import type { TransactionEnvelope } from "@saberhq/solana-contrib";
+import type { PublicKey } from "@solana/web3.js";
+import { Keypair } from "@solana/web3.js";
+
+import type {
+  GovernanceParameters,
+  GovernorWrapper,
+  LockerParams,
+} from "../..";
+import {
+  DEFAULT_GOVERNANCE_PARAMETERS,
+  DEFAULT_LOCKER_PARAMS,
+} from "../../constants";
+import type { TribecaSDK } from "../../sdk";
+import { createGovernorWithElectorate } from "../govern/setup";
+import { LockerWrapper } from "./locker";
+
+/**
+ * Creates a new Locker.
+ * @returns
+ */
+export const createLocker = async ({
+  sdk,
+  gokiSDK,
+  govTokenMint,
+  owners = [sdk.provider.wallet.publicKey],
+  governanceParameters = DEFAULT_GOVERNANCE_PARAMETERS,
+  lockerParams = DEFAULT_LOCKER_PARAMS,
+  governorBaseKP = Keypair.generate(),
+  lockerBaseKP = Keypair.generate(),
+  smartWalletBaseKP = Keypair.generate(),
+}: {
+  sdk: TribecaSDK;
+  gokiSDK: GokiSDK;
+  govTokenMint: PublicKey;
+  owners?: PublicKey[];
+  governanceParameters?: Partial<GovernanceParameters>;
+  lockerParams?: Partial<LockerParams>;
+  /**
+   * Base of the governor.
+   */
+  governorBaseKP?: Keypair;
+  /**
+   * Base of the governor.
+   */
+  lockerBaseKP?: Keypair;
+  /**
+   * Base of the smart wallet.
+   */
+  smartWalletBaseKP?: Keypair;
+}): Promise<{
+  governorWrapper: GovernorWrapper;
+  smartWalletWrapper: SmartWalletWrapper;
+  lockerWrapper: LockerWrapper;
+  createTXs: {
+    title: string;
+    tx: TransactionEnvelope;
+  }[];
+}> => {
+  const { electorate, ...governor } = await createGovernorWithElectorate({
+    createElectorate: async (governorKey) => {
+      const { locker, tx: tx1 } = await sdk.createLocker({
+        ...lockerParams,
+        baseKP: lockerBaseKP,
+        governor: governorKey,
+        govTokenMint,
+      });
+      return {
+        key: locker,
+        tx: tx1,
+      };
+    },
+    sdk,
+    gokiSDK,
+    owners,
+    governanceParameters,
+    govBaseKP: governorBaseKP,
+    smartWalletBaseKP,
+  });
+  return {
+    ...governor,
+    lockerWrapper: new LockerWrapper(
+      sdk,
+      electorate,
+      governor.governorWrapper.governorKey
+    ),
+  };
+};
diff --git a/helpers/idl/stake.json b/helpers/idl/stake.json
index ec5897ed..5396d09c 100644
--- a/helpers/idl/stake.json
+++ b/helpers/idl/stake.json
@@ -357,6 +357,81 @@
           "type": "i64"
         }
       ]
+    },
+    {
+      "name": "stakeV2",
+      "accounts": [
+        {
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "tokenMint",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "pTokenMint",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "pTokenFrom",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userAuthority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "tokenVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "lockedTokens",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "lockerProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "amount",
+          "type": "u64"
+        },
+        {
+          "name": "duration",
+          "type": "i64"
+        }
+      ]
     }
   ],
   "accounts": [
diff --git a/helpers/parser.ts b/helpers/parser.ts
index bc41e88a..39bf8dc9 100644
--- a/helpers/parser.ts
+++ b/helpers/parser.ts
@@ -1,8 +1,9 @@
 import { GOKI_CODERS } from '@gokiprotocol/client';
 import { makeParserHooks, makeProgramParserHooks } from '@saberhq/sail';
 import { SNAPSHOTS_CODERS } from '@saberhq/snapshots';
+import { HONEY_DAO_CODERS } from './dao';
 
-import { HONEY_DAO_CODERS } from './sdk';
+// import { HONEY_DAO_CODERS } from './sdk';
 
 const parserHooks = makeParserHooks({
   ...HONEY_DAO_CODERS.Govern.accountParsers,
diff --git a/helpers/sdk/constant.ts b/helpers/sdk/constant.ts
index 5cc184c4..2fca2681 100644
--- a/helpers/sdk/constant.ts
+++ b/helpers/sdk/constant.ts
@@ -1,20 +1,15 @@
 import { PublicKey } from '@solana/web3.js';
-import { buildCoderMap } from '@saberhq/anchor-contrib';
-import type { GovernTypes } from '@tribecahq/tribeca-sdk';
-import { GovernJSON } from '@tribecahq/tribeca-sdk';
-import type { LockedVoterTypes } from 'helpers/programs/veHoney';
-import { IDL } from 'helpers/types/ve_honey';
 
 export const HONEY_WADS = 1000000;
 
 export const HONEY_MINT = new PublicKey(
-  'HonyeYAaTPgKUgQpayL914P6VAqbQZPrbkGMETZvW4iN'
+  'Bh7vMfPZkGsQJqUjBBGGfcAj6yQdkL8SoLtK5TCYeJtY'
 );
 
 export const HONEY_DECIMALS = 6;
 
 export const PHONEY_MINT = new PublicKey(
-  'PHnyhLEnsD9SiP9tk9kHHKiCxCTPFnymzPspDqAicMe'
+  '7unYPivFG6cuDGeDVjhbutcjYDcMKPu2mBCnRyJ5Qki2'
 );
 
 export const WHITELIST_ENTRY = new PublicKey(
@@ -23,25 +18,6 @@ export const WHITELIST_ENTRY = new PublicKey(
 
 export const PHONEY_DECIMALS = 6;
 
-// See `Anchor.toml` for all addresses.
-export const HONEY_DAO_ADDRESSES = {
-  Govern: new PublicKey('Govz1VyoyLD5BL6CSCxUJLVLsQHRwjfFj1prNsdNg5Jw'),
-  LockedVoter: new PublicKey(process.env.NEXT_PUBLIC_VOTE_PROGRAM_ID!)
-};
-
-/**
- * Program IDLs.
- */
-export const HONEY_DAO_IDLS = {
-  Govern: GovernJSON,
-  LockedVoter: IDL
-};
-
-export const HONEY_DAO_CODERS = buildCoderMap<{
-  Govern: GovernTypes;
-  LockedVoter: LockedVoterTypes;
-}>(HONEY_DAO_IDLS, HONEY_DAO_ADDRESSES);
-
 export const PROPOSAL_TITLE_MAX_LEN = 140;
 
 export const GOVERNOR_ADDRESS = new PublicKey(
diff --git a/helpers/sdk/gov.ts b/helpers/sdk/gov.ts
index 72643567..38a200aa 100644
--- a/helpers/sdk/gov.ts
+++ b/helpers/sdk/gov.ts
@@ -1,3 +1,4 @@
+import { useMemo } from 'react';
 import type { GOKI_ADDRESSES } from '@gokiprotocol/client';
 import { GokiSDK } from '@gokiprotocol/client';
 import { useNativeAccount } from '@saberhq/sail';
@@ -6,9 +7,8 @@ import type { TokenAmount } from '@saberhq/token-utils';
 import { useConnectedWallet, useConnectionContext } from '@saberhq/use-solana';
 import type { PublicKey } from '@solana/web3.js';
 import { Keypair } from '@solana/web3.js';
-import { TribecaSDK } from '@tribecahq/tribeca-sdk';
-import { useMemo } from 'react';
 import { createContainer } from 'unstated-next';
+import { TribecaSDK } from 'helpers/dao';
 
 export type ProgramKey = keyof typeof GOKI_ADDRESSES;
 
diff --git a/helpers/sdk/index.ts b/helpers/sdk/index.ts
index bc1993f0..8420aaaa 100644
--- a/helpers/sdk/index.ts
+++ b/helpers/sdk/index.ts
@@ -2,3 +2,4 @@ export * from './constant';
 export * from './stake';
 export * from './vehoney';
 export * from './gov';
+export * from './pda';
diff --git a/helpers/sdk/pda.ts b/helpers/sdk/pda.ts
new file mode 100644
index 00000000..cdaa4c65
--- /dev/null
+++ b/helpers/sdk/pda.ts
@@ -0,0 +1,42 @@
+import { utils } from '@project-serum/anchor';
+import { PublicKey, SystemProgram } from '@solana/web3.js';
+import { HONEY_DAO_ADDRESSES } from 'helpers/dao';
+
+export const findLockerAddress = async (
+  base: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [utils.bytes.utf8.encode('Locker'), base.toBuffer()],
+    HONEY_DAO_ADDRESSES.LockedVoter
+  );
+};
+
+export const findEscrowAddress = async (
+  locker: PublicKey,
+  authority: PublicKey
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [
+      utils.bytes.utf8.encode('Escrow'),
+      locker.toBuffer(),
+      authority.toBuffer()
+    ],
+    HONEY_DAO_ADDRESSES.LockedVoter
+  );
+};
+
+export const findWhitelistAddress = async (
+  locker: PublicKey,
+  programId: PublicKey,
+  owner: PublicKey | null
+): Promise<[PublicKey, number]> => {
+  return await PublicKey.findProgramAddress(
+    [
+      utils.bytes.utf8.encode('LockerWhitelistEntry'),
+      locker.toBuffer(),
+      programId.toBuffer(),
+      owner ? owner.toBuffer() : SystemProgram.programId.toBuffer()
+    ],
+    HONEY_DAO_ADDRESSES.LockedVoter
+  );
+};
diff --git a/helpers/sdk/stake.ts b/helpers/sdk/stake.ts
index a6637b99..84edc24d 100644
--- a/helpers/sdk/stake.ts
+++ b/helpers/sdk/stake.ts
@@ -156,7 +156,7 @@ export class StakeClient extends ClientBase<Stake> {
     hasEscrow?: boolean
   ) {
     const preInstructions = !hasEscrow
-      ? [...(await veHoneyClient.createInitializeEscrowIx(locker))]
+      ? [...(await veHoneyClient.createInitializeEscrowV2Ix(locker))]
       : undefined;
 
     const remainingAccounts = whitelistEnabled
@@ -186,7 +186,7 @@ export class StakeClient extends ClientBase<Stake> {
     const lockedTokens = await veHoneyClient.getEscrowLockedTokenPDA(escrow);
     const lockerProgram = veHoneyClient.getProgramId();
 
-    const txSig = await this.program.rpc.stake(
+    const txSig = await this.program.rpc.stakeV2(
       new anchor.BN(amount),
       new anchor.BN(duration),
       {
diff --git a/helpers/sdk/vehoney.ts b/helpers/sdk/vehoney.ts
index 454326e5..3fb68d90 100644
--- a/helpers/sdk/vehoney.ts
+++ b/helpers/sdk/vehoney.ts
@@ -262,7 +262,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
   ) {
     const preInstructions = [];
     if (!hasEscrow) {
-      preInstructions.push(...(await this.createInitializeEscrowIx(locker)));
+      preInstructions.push(...(await this.createInitializeEscrowV2Ix(locker)));
     }
 
     const remainingAccounts = [
diff --git a/helpers/types/govern.ts b/helpers/types/govern.ts
new file mode 100644
index 00000000..d2a45e5b
--- /dev/null
+++ b/helpers/types/govern.ts
@@ -0,0 +1,1719 @@
+import { generateErrorMap } from "@saberhq/anchor-contrib";
+
+export type GovernIDL = {
+  version: "0.5.6";
+  name: "govern";
+  instructions: [
+    {
+      name: "createGovernor";
+      accounts: [
+        {
+          name: "base";
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: "governor";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "smartWallet";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "payer";
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: "systemProgram";
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: "bump";
+          type: "u8";
+        },
+        {
+          name: "electorate";
+          type: "publicKey";
+        },
+        {
+          name: "params";
+          type: {
+            defined: "GovernanceParameters";
+          };
+        }
+      ];
+    },
+    {
+      name: "createProposal";
+      accounts: [
+        {
+          name: "governor";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "proposal";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "proposer";
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: "payer";
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: "systemProgram";
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: "bump";
+          type: "u8";
+        },
+        {
+          name: "instructions";
+          type: {
+            vec: {
+              defined: "ProposalInstruction";
+            };
+          };
+        }
+      ];
+    },
+    {
+      name: "activateProposal";
+      accounts: [
+        {
+          name: "governor";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "proposal";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "electorate";
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: "cancelProposal";
+      accounts: [
+        {
+          name: "governor";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "proposal";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "proposer";
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [];
+    },
+    {
+      name: "queueProposal";
+      accounts: [
+        {
+          name: "governor";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "proposal";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "transaction";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "smartWallet";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "payer";
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: "smartWalletProgram";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "systemProgram";
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: "txBump";
+          type: "u8";
+        }
+      ];
+    },
+    {
+      name: "newVote";
+      accounts: [
+        {
+          name: "proposal";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "vote";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "payer";
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: "systemProgram";
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: "bump";
+          type: "u8";
+        },
+        {
+          name: "voter";
+          type: "publicKey";
+        }
+      ];
+    },
+    {
+      name: "setVote";
+      accounts: [
+        {
+          name: "governor";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "proposal";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "vote";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "electorate";
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [
+        {
+          name: "side";
+          type: "u8";
+        },
+        {
+          name: "weight";
+          type: "u64";
+        }
+      ];
+    },
+    {
+      name: "setGovernanceParams";
+      accounts: [
+        {
+          name: "governor";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "smartWallet";
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [
+        {
+          name: "params";
+          type: {
+            defined: "GovernanceParameters";
+          };
+        }
+      ];
+    },
+    {
+      name: "setElectorate";
+      accounts: [
+        {
+          name: "governor";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "smartWallet";
+          isMut: false;
+          isSigner: true;
+        }
+      ];
+      args: [
+        {
+          name: "newElectorate";
+          type: "publicKey";
+        }
+      ];
+    },
+    {
+      name: "createProposalMeta";
+      accounts: [
+        {
+          name: "proposal";
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: "proposer";
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: "proposalMeta";
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: "payer";
+          isMut: true;
+          isSigner: true;
+        },
+        {
+          name: "systemProgram";
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: "bump";
+          type: "u8";
+        },
+        {
+          name: "title";
+          type: "string";
+        },
+        {
+          name: "descriptionLink";
+          type: "string";
+        }
+      ];
+    }
+  ];
+  accounts: [
+    {
+      name: "Governor";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "base";
+            type: "publicKey";
+          },
+          {
+            name: "bump";
+            type: "u8";
+          },
+          {
+            name: "proposalCount";
+            type: "u64";
+          },
+          {
+            name: "electorate";
+            type: "publicKey";
+          },
+          {
+            name: "smartWallet";
+            type: "publicKey";
+          },
+          {
+            name: "params";
+            type: {
+              defined: "GovernanceParameters";
+            };
+          }
+        ];
+      };
+    },
+    {
+      name: "Proposal";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "governor";
+            type: "publicKey";
+          },
+          {
+            name: "index";
+            type: "u64";
+          },
+          {
+            name: "bump";
+            type: "u8";
+          },
+          {
+            name: "proposer";
+            type: "publicKey";
+          },
+          {
+            name: "quorumVotes";
+            type: "u64";
+          },
+          {
+            name: "forVotes";
+            type: "u64";
+          },
+          {
+            name: "againstVotes";
+            type: "u64";
+          },
+          {
+            name: "abstainVotes";
+            type: "u64";
+          },
+          {
+            name: "canceledAt";
+            type: "i64";
+          },
+          {
+            name: "createdAt";
+            type: "i64";
+          },
+          {
+            name: "activatedAt";
+            type: "i64";
+          },
+          {
+            name: "votingEndsAt";
+            type: "i64";
+          },
+          {
+            name: "queuedAt";
+            type: "i64";
+          },
+          {
+            name: "queuedTransaction";
+            type: "publicKey";
+          },
+          {
+            name: "instructions";
+            type: {
+              vec: {
+                defined: "ProposalInstruction";
+              };
+            };
+          }
+        ];
+      };
+    },
+    {
+      name: "ProposalMeta";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "proposal";
+            type: "publicKey";
+          },
+          {
+            name: "title";
+            type: "string";
+          },
+          {
+            name: "descriptionLink";
+            type: "string";
+          }
+        ];
+      };
+    },
+    {
+      name: "Vote";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "proposal";
+            type: "publicKey";
+          },
+          {
+            name: "voter";
+            type: "publicKey";
+          },
+          {
+            name: "bump";
+            type: "u8";
+          },
+          {
+            name: "side";
+            type: "u8";
+          },
+          {
+            name: "weight";
+            type: "u64";
+          }
+        ];
+      };
+    }
+  ];
+  types: [
+    {
+      name: "GovernanceParameters";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "votingDelay";
+            type: "u64";
+          },
+          {
+            name: "votingPeriod";
+            type: "u64";
+          },
+          {
+            name: "quorumVotes";
+            type: "u64";
+          },
+          {
+            name: "timelockDelaySeconds";
+            type: "i64";
+          }
+        ];
+      };
+    },
+    {
+      name: "ProposalInstruction";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "programId";
+            type: "publicKey";
+          },
+          {
+            name: "keys";
+            type: {
+              vec: {
+                defined: "ProposalAccountMeta";
+              };
+            };
+          },
+          {
+            name: "data";
+            type: "bytes";
+          }
+        ];
+      };
+    },
+    {
+      name: "ProposalAccountMeta";
+      type: {
+        kind: "struct";
+        fields: [
+          {
+            name: "pubkey";
+            type: "publicKey";
+          },
+          {
+            name: "isSigner";
+            type: "bool";
+          },
+          {
+            name: "isWritable";
+            type: "bool";
+          }
+        ];
+      };
+    },
+    {
+      name: "ProposalState";
+      type: {
+        kind: "enum";
+        variants: [
+          {
+            name: "Draft";
+          },
+          {
+            name: "Active";
+          },
+          {
+            name: "Canceled";
+          },
+          {
+            name: "Defeated";
+          },
+          {
+            name: "Succeeded";
+          },
+          {
+            name: "Queued";
+          }
+        ];
+      };
+    },
+    {
+      name: "VoteSide";
+      type: {
+        kind: "enum";
+        variants: [
+          {
+            name: "Pending";
+          },
+          {
+            name: "Against";
+          },
+          {
+            name: "For";
+          },
+          {
+            name: "Abstain";
+          }
+        ];
+      };
+    }
+  ];
+  events: [
+    {
+      name: "GovernorCreateEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "electorate";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "smartWallet";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "parameters";
+          type: {
+            defined: "GovernanceParameters";
+          };
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "ProposalCreateEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "proposal";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "index";
+          type: "u64";
+          index: false;
+        },
+        {
+          name: "instructions";
+          type: {
+            vec: {
+              defined: "ProposalInstruction";
+            };
+          };
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "ProposalActivateEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "proposal";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "votingEndsAt";
+          type: "i64";
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "ProposalCancelEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "proposal";
+          type: "publicKey";
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "ProposalQueueEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "proposal";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "transaction";
+          type: "publicKey";
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "VoteSetEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "proposal";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "voter";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "vote";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "side";
+          type: "u8";
+          index: false;
+        },
+        {
+          name: "weight";
+          type: "u64";
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "ProposalMetaCreateEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "proposal";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "title";
+          type: "string";
+          index: false;
+        },
+        {
+          name: "descriptionLink";
+          type: "string";
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "GovernorSetParamsEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "prevParams";
+          type: {
+            defined: "GovernanceParameters";
+          };
+          index: false;
+        },
+        {
+          name: "params";
+          type: {
+            defined: "GovernanceParameters";
+          };
+          index: false;
+        }
+      ];
+    },
+    {
+      name: "GovernorSetElectorateEvent";
+      fields: [
+        {
+          name: "governor";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "prevElectorate";
+          type: "publicKey";
+          index: false;
+        },
+        {
+          name: "newElectorate";
+          type: "publicKey";
+          index: false;
+        }
+      ];
+    }
+  ];
+  errors: [
+    {
+      code: 6000;
+      name: "InvalidVoteSide";
+      msg: "Invalid vote side.";
+    },
+    {
+      code: 6001;
+      name: "GovernorNotFound";
+      msg: "The owner of the smart wallet doesn't match with current.";
+    },
+    {
+      code: 6002;
+      name: "VotingDelayNotMet";
+      msg: "The proposal cannot be activated since it has not yet passed the voting delay.";
+    },
+    {
+      code: 6003;
+      name: "ProposalNotDraft";
+      msg: "Only drafts can be canceled.";
+    },
+    {
+      code: 6004;
+      name: "ProposalNotActive";
+      msg: "The proposal must be active.";
+    }
+  ];
+};
+export const GovernJSON: GovernIDL = {
+  version: "0.5.6",
+  name: "govern",
+  instructions: [
+    {
+      name: "createGovernor",
+      accounts: [
+        {
+          name: "base",
+          isMut: false,
+          isSigner: true,
+        },
+        {
+          name: "governor",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "smartWallet",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "payer",
+          isMut: true,
+          isSigner: true,
+        },
+        {
+          name: "systemProgram",
+          isMut: false,
+          isSigner: false,
+        },
+      ],
+      args: [
+        {
+          name: "bump",
+          type: "u8",
+        },
+        {
+          name: "electorate",
+          type: "publicKey",
+        },
+        {
+          name: "params",
+          type: {
+            defined: "GovernanceParameters",
+          },
+        },
+      ],
+    },
+    {
+      name: "createProposal",
+      accounts: [
+        {
+          name: "governor",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "proposal",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "proposer",
+          isMut: false,
+          isSigner: true,
+        },
+        {
+          name: "payer",
+          isMut: true,
+          isSigner: true,
+        },
+        {
+          name: "systemProgram",
+          isMut: false,
+          isSigner: false,
+        },
+      ],
+      args: [
+        {
+          name: "bump",
+          type: "u8",
+        },
+        {
+          name: "instructions",
+          type: {
+            vec: {
+              defined: "ProposalInstruction",
+            },
+          },
+        },
+      ],
+    },
+    {
+      name: "activateProposal",
+      accounts: [
+        {
+          name: "governor",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "proposal",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "electorate",
+          isMut: false,
+          isSigner: true,
+        },
+      ],
+      args: [],
+    },
+    {
+      name: "cancelProposal",
+      accounts: [
+        {
+          name: "governor",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "proposal",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "proposer",
+          isMut: false,
+          isSigner: true,
+        },
+      ],
+      args: [],
+    },
+    {
+      name: "queueProposal",
+      accounts: [
+        {
+          name: "governor",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "proposal",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "transaction",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "smartWallet",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "payer",
+          isMut: true,
+          isSigner: true,
+        },
+        {
+          name: "smartWalletProgram",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "systemProgram",
+          isMut: false,
+          isSigner: false,
+        },
+      ],
+      args: [
+        {
+          name: "txBump",
+          type: "u8",
+        },
+      ],
+    },
+    {
+      name: "newVote",
+      accounts: [
+        {
+          name: "proposal",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "vote",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "payer",
+          isMut: true,
+          isSigner: true,
+        },
+        {
+          name: "systemProgram",
+          isMut: false,
+          isSigner: false,
+        },
+      ],
+      args: [
+        {
+          name: "bump",
+          type: "u8",
+        },
+        {
+          name: "voter",
+          type: "publicKey",
+        },
+      ],
+    },
+    {
+      name: "setVote",
+      accounts: [
+        {
+          name: "governor",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "proposal",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "vote",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "electorate",
+          isMut: false,
+          isSigner: true,
+        },
+      ],
+      args: [
+        {
+          name: "side",
+          type: "u8",
+        },
+        {
+          name: "weight",
+          type: "u64",
+        },
+      ],
+    },
+    {
+      name: "setGovernanceParams",
+      accounts: [
+        {
+          name: "governor",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "smartWallet",
+          isMut: false,
+          isSigner: true,
+        },
+      ],
+      args: [
+        {
+          name: "params",
+          type: {
+            defined: "GovernanceParameters",
+          },
+        },
+      ],
+    },
+    {
+      name: "setElectorate",
+      accounts: [
+        {
+          name: "governor",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "smartWallet",
+          isMut: false,
+          isSigner: true,
+        },
+      ],
+      args: [
+        {
+          name: "newElectorate",
+          type: "publicKey",
+        },
+      ],
+    },
+    {
+      name: "createProposalMeta",
+      accounts: [
+        {
+          name: "proposal",
+          isMut: false,
+          isSigner: false,
+        },
+        {
+          name: "proposer",
+          isMut: false,
+          isSigner: true,
+        },
+        {
+          name: "proposalMeta",
+          isMut: true,
+          isSigner: false,
+        },
+        {
+          name: "payer",
+          isMut: true,
+          isSigner: true,
+        },
+        {
+          name: "systemProgram",
+          isMut: false,
+          isSigner: false,
+        },
+      ],
+      args: [
+        {
+          name: "bump",
+          type: "u8",
+        },
+        {
+          name: "title",
+          type: "string",
+        },
+        {
+          name: "descriptionLink",
+          type: "string",
+        },
+      ],
+    },
+  ],
+  accounts: [
+    {
+      name: "Governor",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "base",
+            type: "publicKey",
+          },
+          {
+            name: "bump",
+            type: "u8",
+          },
+          {
+            name: "proposalCount",
+            type: "u64",
+          },
+          {
+            name: "electorate",
+            type: "publicKey",
+          },
+          {
+            name: "smartWallet",
+            type: "publicKey",
+          },
+          {
+            name: "params",
+            type: {
+              defined: "GovernanceParameters",
+            },
+          },
+        ],
+      },
+    },
+    {
+      name: "Proposal",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "governor",
+            type: "publicKey",
+          },
+          {
+            name: "index",
+            type: "u64",
+          },
+          {
+            name: "bump",
+            type: "u8",
+          },
+          {
+            name: "proposer",
+            type: "publicKey",
+          },
+          {
+            name: "quorumVotes",
+            type: "u64",
+          },
+          {
+            name: "forVotes",
+            type: "u64",
+          },
+          {
+            name: "againstVotes",
+            type: "u64",
+          },
+          {
+            name: "abstainVotes",
+            type: "u64",
+          },
+          {
+            name: "canceledAt",
+            type: "i64",
+          },
+          {
+            name: "createdAt",
+            type: "i64",
+          },
+          {
+            name: "activatedAt",
+            type: "i64",
+          },
+          {
+            name: "votingEndsAt",
+            type: "i64",
+          },
+          {
+            name: "queuedAt",
+            type: "i64",
+          },
+          {
+            name: "queuedTransaction",
+            type: "publicKey",
+          },
+          {
+            name: "instructions",
+            type: {
+              vec: {
+                defined: "ProposalInstruction",
+              },
+            },
+          },
+        ],
+      },
+    },
+    {
+      name: "ProposalMeta",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "proposal",
+            type: "publicKey",
+          },
+          {
+            name: "title",
+            type: "string",
+          },
+          {
+            name: "descriptionLink",
+            type: "string",
+          },
+        ],
+      },
+    },
+    {
+      name: "Vote",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "proposal",
+            type: "publicKey",
+          },
+          {
+            name: "voter",
+            type: "publicKey",
+          },
+          {
+            name: "bump",
+            type: "u8",
+          },
+          {
+            name: "side",
+            type: "u8",
+          },
+          {
+            name: "weight",
+            type: "u64",
+          },
+        ],
+      },
+    },
+  ],
+  types: [
+    {
+      name: "GovernanceParameters",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "votingDelay",
+            type: "u64",
+          },
+          {
+            name: "votingPeriod",
+            type: "u64",
+          },
+          {
+            name: "quorumVotes",
+            type: "u64",
+          },
+          {
+            name: "timelockDelaySeconds",
+            type: "i64",
+          },
+        ],
+      },
+    },
+    {
+      name: "ProposalInstruction",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "programId",
+            type: "publicKey",
+          },
+          {
+            name: "keys",
+            type: {
+              vec: {
+                defined: "ProposalAccountMeta",
+              },
+            },
+          },
+          {
+            name: "data",
+            type: "bytes",
+          },
+        ],
+      },
+    },
+    {
+      name: "ProposalAccountMeta",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "pubkey",
+            type: "publicKey",
+          },
+          {
+            name: "isSigner",
+            type: "bool",
+          },
+          {
+            name: "isWritable",
+            type: "bool",
+          },
+        ],
+      },
+    },
+    {
+      name: "ProposalState",
+      type: {
+        kind: "enum",
+        variants: [
+          {
+            name: "Draft",
+          },
+          {
+            name: "Active",
+          },
+          {
+            name: "Canceled",
+          },
+          {
+            name: "Defeated",
+          },
+          {
+            name: "Succeeded",
+          },
+          {
+            name: "Queued",
+          },
+        ],
+      },
+    },
+    {
+      name: "VoteSide",
+      type: {
+        kind: "enum",
+        variants: [
+          {
+            name: "Pending",
+          },
+          {
+            name: "Against",
+          },
+          {
+            name: "For",
+          },
+          {
+            name: "Abstain",
+          },
+        ],
+      },
+    },
+  ],
+  events: [
+    {
+      name: "GovernorCreateEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "electorate",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "smartWallet",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "parameters",
+          type: {
+            defined: "GovernanceParameters",
+          },
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "ProposalCreateEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "proposal",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "index",
+          type: "u64",
+          index: false,
+        },
+        {
+          name: "instructions",
+          type: {
+            vec: {
+              defined: "ProposalInstruction",
+            },
+          },
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "ProposalActivateEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "proposal",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "votingEndsAt",
+          type: "i64",
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "ProposalCancelEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "proposal",
+          type: "publicKey",
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "ProposalQueueEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "proposal",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "transaction",
+          type: "publicKey",
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "VoteSetEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "proposal",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "voter",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "vote",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "side",
+          type: "u8",
+          index: false,
+        },
+        {
+          name: "weight",
+          type: "u64",
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "ProposalMetaCreateEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "proposal",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "title",
+          type: "string",
+          index: false,
+        },
+        {
+          name: "descriptionLink",
+          type: "string",
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "GovernorSetParamsEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "prevParams",
+          type: {
+            defined: "GovernanceParameters",
+          },
+          index: false,
+        },
+        {
+          name: "params",
+          type: {
+            defined: "GovernanceParameters",
+          },
+          index: false,
+        },
+      ],
+    },
+    {
+      name: "GovernorSetElectorateEvent",
+      fields: [
+        {
+          name: "governor",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "prevElectorate",
+          type: "publicKey",
+          index: false,
+        },
+        {
+          name: "newElectorate",
+          type: "publicKey",
+          index: false,
+        },
+      ],
+    },
+  ],
+  errors: [
+    {
+      code: 6000,
+      name: "InvalidVoteSide",
+      msg: "Invalid vote side.",
+    },
+    {
+      code: 6001,
+      name: "GovernorNotFound",
+      msg: "The owner of the smart wallet doesn't match with current.",
+    },
+    {
+      code: 6002,
+      name: "VotingDelayNotMet",
+      msg: "The proposal cannot be activated since it has not yet passed the voting delay.",
+    },
+    {
+      code: 6003,
+      name: "ProposalNotDraft",
+      msg: "Only drafts can be canceled.",
+    },
+    {
+      code: 6004,
+      name: "ProposalNotActive",
+      msg: "The proposal must be active.",
+    },
+  ],
+};
+export const GovernErrors = generateErrorMap(GovernJSON);
diff --git a/helpers/types/stake.ts b/helpers/types/stake.ts
index 27947aee..ec03a791 100644
--- a/helpers/types/stake.ts
+++ b/helpers/types/stake.ts
@@ -357,6 +357,81 @@ export type Stake = {
           type: 'i64';
         }
       ];
+    },
+    {
+      name: 'stakeV2';
+      accounts: [
+        {
+          name: 'poolInfo';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'tokenMint';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'pTokenMint';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'pTokenFrom';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'userAuthority';
+          isMut: false;
+          isSigner: true;
+        },
+        {
+          name: 'tokenVault';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'authority';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'locker';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'escrow';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'lockedTokens';
+          isMut: true;
+          isSigner: false;
+        },
+        {
+          name: 'lockerProgram';
+          isMut: false;
+          isSigner: false;
+        },
+        {
+          name: 'tokenProgram';
+          isMut: false;
+          isSigner: false;
+        }
+      ];
+      args: [
+        {
+          name: 'amount';
+          type: 'u64';
+        },
+        {
+          name: 'duration';
+          type: 'i64';
+        }
+      ];
     }
   ];
   accounts: [
@@ -847,6 +922,81 @@ export const IDL: Stake = {
           type: 'i64'
         }
       ]
+    },
+    {
+      name: 'stakeV2',
+      accounts: [
+        {
+          name: 'poolInfo',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'tokenMint',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'pTokenMint',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'pTokenFrom',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'userAuthority',
+          isMut: false,
+          isSigner: true
+        },
+        {
+          name: 'tokenVault',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'authority',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'locker',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'escrow',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'lockedTokens',
+          isMut: true,
+          isSigner: false
+        },
+        {
+          name: 'lockerProgram',
+          isMut: false,
+          isSigner: false
+        },
+        {
+          name: 'tokenProgram',
+          isMut: false,
+          isSigner: false
+        }
+      ],
+      args: [
+        {
+          name: 'amount',
+          type: 'u64'
+        },
+        {
+          name: 'duration',
+          type: 'i64'
+        }
+      ]
     }
   ],
   accounts: [
diff --git a/helpers/utils.ts b/helpers/utils.ts
index e646cc3a..d98d438c 100644
--- a/helpers/utils.ts
+++ b/helpers/utils.ts
@@ -18,7 +18,7 @@ import * as anchor from '@project-serum/anchor';
 import type { Network } from '@saberhq/solana-contrib';
 import type { Cluster, TransactionInstruction } from '@solana/web3.js';
 import { TokenInfo } from '@saberhq/token-utils';
-import { VoteSide } from '@tribecahq/tribeca-sdk';
+import { VoteSide } from 'helpers/dao';
 import { SmartWalletTransactionData } from '@gokiprotocol/client';
 import BN from 'bn.js';
 
diff --git a/hooks/tribeca/useEscrow.ts b/hooks/tribeca/useEscrow.ts
index 0eeb9e6b..2b5c4c8d 100644
--- a/hooks/tribeca/useEscrow.ts
+++ b/hooks/tribeca/useEscrow.ts
@@ -1,9 +1,9 @@
 import { TokenAmount } from '@saberhq/token-utils';
 import { useSolana } from '@saberhq/use-solana';
 import type { PublicKey } from '@solana/web3.js';
-import { findEscrowAddress, VoteEscrow } from '@tribecahq/tribeca-sdk';
+import { VoteEscrow } from 'helpers/dao';
 import { useEscrowData, useLockerData } from 'helpers/parser';
-import { useSDK } from 'helpers/sdk';
+import { findEscrowAddress, useSDK } from 'helpers/sdk';
 import { useEffect } from 'react';
 import { useQuery } from 'react-query';
 import invariant from 'tiny-invariant';
@@ -38,14 +38,10 @@ export const useEscrow = (owner?: PublicKey) => {
     }
   );
 
-  const {
-    data: escrow,
-    isLoading: isEscrowLoading,
-    ...rest
-  } = useEscrowData(escrowKey);
+  const { data: escrow, isLoading: isEscrowLoading } = useEscrowData(escrowKey);
   const canLoadEscrow =
     !!governorData && !!(lockerKey && owner && tribecaMut && escrow);
-  console.log(canLoadEscrow, rest);
+
   const result = useQuery(
     ['escrow', escrow?.publicKey.toString()],
     async () => {
diff --git a/hooks/tribeca/useGovernor.ts b/hooks/tribeca/useGovernor.ts
index 304e13ef..2c93994f 100644
--- a/hooks/tribeca/useGovernor.ts
+++ b/hooks/tribeca/useGovernor.ts
@@ -1,7 +1,7 @@
-import { useAccountData, usePubkey, useToken } from '@saberhq/sail';
+import { useAccountData, useToken } from '@saberhq/sail';
 import { Token, TokenAmount } from '@saberhq/token-utils';
 import type { PublicKey } from '@solana/web3.js';
-import { GovernorWrapper } from '@tribecahq/tribeca-sdk';
+import { GovernorWrapper } from 'helpers/dao';
 import { useMemo } from 'react';
 import { createContainer } from 'unstated-next';
 
diff --git a/hooks/tribeca/useProposals.ts b/hooks/tribeca/useProposals.ts
index e7f54c13..2c8dd25a 100644
--- a/hooks/tribeca/useProposals.ts
+++ b/hooks/tribeca/useProposals.ts
@@ -3,13 +3,13 @@ import { getCacheKeyOfPublicKey } from '@saberhq/sail';
 import { u64 } from '@saberhq/token-utils';
 import { useSolana } from '@saberhq/use-solana';
 import type { PublicKey } from '@solana/web3.js';
-import type { ProposalData, ProposalMetaData } from '@tribecahq/tribeca-sdk';
+import type { ProposalData, ProposalMetaData } from 'helpers/dao';
 import {
   findProposalAddress,
   findProposalMetaAddress,
   getProposalState,
   ProposalState
-} from '@tribecahq/tribeca-sdk';
+} from 'helpers/dao';
 import BN from 'bn.js';
 import { useEffect, useMemo } from 'react';
 import { useQueries, useQuery } from 'react-query';
diff --git a/hooks/tribeca/useVote.ts b/hooks/tribeca/useVote.ts
index 62b22641..f6f16e57 100644
--- a/hooks/tribeca/useVote.ts
+++ b/hooks/tribeca/useVote.ts
@@ -1,6 +1,6 @@
 import { useSolana } from '@saberhq/use-solana';
 import type { PublicKey } from '@solana/web3.js';
-import { findVoteAddress } from '@tribecahq/tribeca-sdk';
+import { findVoteAddress } from 'helpers/dao';
 import { useQuery } from 'react-query';
 import invariant from 'tiny-invariant';
 
diff --git a/hooks/useParsedInstruction.ts b/hooks/useParsedInstruction.ts
index 447b957a..6f702656 100644
--- a/hooks/useParsedInstruction.ts
+++ b/hooks/useParsedInstruction.ts
@@ -5,7 +5,7 @@ import type {
   IdlAccountItem
 } from '@project-serum/anchor/dist/cjs/idl';
 import type { PublicKey, TransactionInstruction } from '@solana/web3.js';
-import type { ProposalInstruction } from '@tribecahq/tribeca-sdk';
+import type { ProposalInstruction } from 'helpers/dao';
 import { startCase } from 'lodash';
 import { useMemo } from 'react';
 
diff --git a/icons/PulsingDot.tsx b/icons/PulsingDot.tsx
index fd46feaf..d281dee7 100644
--- a/icons/PulsingDot.tsx
+++ b/icons/PulsingDot.tsx
@@ -1,8 +1,8 @@
 export const PulsingDot = (props: { color: string }) => (
   <svg
-    width="200"
-    height="200"
-    viewBox="0 0 40 40"
+    width="44"
+    height="44"
+    viewBox="0 0 44 44"
     xmlns="http://www.w3.org/2000/svg"
   >
     <circle
diff --git a/package.json b/package.json
index 4fea9588..0e5a30a3 100644
--- a/package.json
+++ b/package.json
@@ -27,10 +27,10 @@
     "@nfteyez/sol-rayz-react": "^0.10.2",
     "@octokit/plugin-rest-endpoint-methods": "^5.13.0",
     "@project-serum/anchor": "^0.24.2",
-    "@saberhq/anchor-contrib": "^1.13.1",
+    "@saberhq/anchor-contrib": "^1.12.69",
     "@saberhq/sail": "3.4.4",
     "@saberhq/snapshots": "^0.2.8",
-    "@saberhq/solana-contrib": "^1.13.1",
+    "@saberhq/solana-contrib": "^1.12.69",
     "@saberhq/token-utils": "^1.12.48",
     "@saberhq/use-solana": "^1.12.48",
     "@solana/spl-token": "0.1.8",
@@ -75,5 +75,9 @@
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^2.5.1",
     "typescript": "4.6.2"
+  },
+  "resolutions": {
+    "jsbi": "^4",
+    "@saberhq/solana-contrib": "^1.12.69"
   }
 }
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 177c05d0..26057c3e 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -75,7 +75,13 @@ function MyApp({ Component, pageProps }: AppProps) {
           }}
           networkConfigs={networkConfiguration()}
         >
-          <SailProvider>
+          <SailProvider
+            initialState={{
+              onSailError: err => {
+                console.log(err);
+              }
+            }}
+          >
             <SDKProvider>
               <GovernorProvider
                 initialState={{
diff --git a/yarn.lock b/yarn.lock
index 4a7b7871..d839f705 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -825,12 +825,12 @@
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz#782fa5da44c4f38ae9fd38e9184b54e451936118"
   integrity sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg==
 
-"@saberhq/anchor-contrib@^1.13.1":
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/@saberhq/anchor-contrib/-/anchor-contrib-1.13.1.tgz#457385ce4533363b983c1ff97251dff2e94259e1"
-  integrity sha512-ZiZAqiQLTpFU43zQfLyoEkJjt+0LW5ZSm63wqc7xm0hKOw/ronMkNOslqXbNqIp2rRRg8GzOFgid4TAEWqzuOw==
+"@saberhq/anchor-contrib@^1.12.69":
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/@saberhq/anchor-contrib/-/anchor-contrib-1.13.6.tgz#56e427b3a991dc79a34dddd592a671a29a7f3e53"
+  integrity sha512-WS08qptCZEXWr1pD1mz3bktb8O2/jEze6PaLIUK2rxKHjcLSVPeA5Pmxstsmb7djq8K7TMciZlPkLYSawZrlsQ==
   dependencies:
-    "@saberhq/solana-contrib" "^1.13.1"
+    "@saberhq/solana-contrib" "^1.13.6"
     eventemitter3 "^4.0.7"
     lodash.camelcase "^4.3.0"
     lodash.mapvalues "^4.6.0"
@@ -863,22 +863,10 @@
     tiny-invariant "^1.2.0"
     tslib "^2.3.1"
 
-"@saberhq/solana-contrib@^1.12.56":
-  version "1.12.56"
-  resolved "https://registry.yarnpkg.com/@saberhq/solana-contrib/-/solana-contrib-1.12.56.tgz#0472ba6960d9993c37808697d7afff5b63e11b14"
-  integrity sha512-b6Szv+XqJE9pFqQ6QfQluRyvQIXAdmLk/KrZ2Ks/XtQVMX2ZxdBf5mGozGNa8NzuzgeOzj/BQ8akbAazfll5dw==
-  dependencies:
-    "@types/promise-retry" "^1.1.3"
-    "@types/retry" "^0.12.1"
-    promise-retry "^2.0.1"
-    retry "^0.13.1"
-    tiny-invariant "^1.2.0"
-    tslib "^2.3.1"
-
-"@saberhq/solana-contrib@^1.13.1":
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/@saberhq/solana-contrib/-/solana-contrib-1.13.1.tgz#b1b583c13ea80d191736947d27b25ca5dd59fd77"
-  integrity sha512-2hWKZS8bhH1QXVzkf0OoMDdNDc/POCUUbKQEGwZBv+ri/9GUkfihYm6TPgVecmqa6PM1qMtUDGqrC529Pi/4mQ==
+"@saberhq/solana-contrib@^1.12.56", "@saberhq/solana-contrib@^1.12.69", "@saberhq/solana-contrib@^1.13.6":
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/@saberhq/solana-contrib/-/solana-contrib-1.13.6.tgz#6a221eab85afc49d08d8bfabc098b2a6f401f45c"
+  integrity sha512-gDZoFJoHU1q8WtWDkNYBxIukaLga4836DMxlFmFt+4ZWXQB1foUm/XX5G12keYJFk2T0SpaQ80uybGy+5gVGxw==
   dependencies:
     "@solana/buffer-layout" "^4.0.0"
     "@types/promise-retry" "^1.1.3"
@@ -1379,7 +1367,7 @@
   resolved "https://registry.yarnpkg.com/@types/resize-observer-browser/-/resize-observer-browser-0.1.7.tgz#294aaadf24ac6580b8fbd1fe3ab7b59fe85f9ef3"
   integrity sha512-G9eN0Sn0ii9PWQ3Vl72jDPgeJwRWhv2Qk/nQkJuWmRmOB4HX3/BhD5SE1dZs/hzPZL/WKnvF0RHdTSG54QJFyg==
 
-"@types/retry@*", "@types/retry@^0.12.1":
+"@types/retry@*":
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
   integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
@@ -4307,6 +4295,11 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+jsbi@^4:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741"
+  integrity sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==
+
 jsbi@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.2.0.tgz#975567e0dd47fdf91bad4b5a681070d15e244b68"

From 166d2fac25e8a3e027849f11ca35bb3d89e9c6f5 Mon Sep 17 00:00:00 2001
From: BowTiedHeron <93859808+BowTiedHeron@users.noreply.github.com>
Date: Tue, 17 May 2022 17:27:54 +0200
Subject: [PATCH 047/101] test vercel

---
 pages/_app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/_app.tsx b/pages/_app.tsx
index 26057c3e..7939cc29 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -108,4 +108,4 @@ function MyApp({ Component, pageProps }: AppProps) {
   );
 }
 
-export default MyApp;
+export default MyApp; 

From e4c6a51cf5356d6df6e6006ce440186c9cbca73b Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Thu, 19 May 2022 13:03:40 -0500
Subject: [PATCH 048/101] Fix build error

---
 helpers/dao/wrappers/govern/governor.ts   | 74 +++++++++++------------
 helpers/dao/wrappers/lockedVoter/setup.ts | 36 +++++------
 package.json                              |  2 +-
 yarn.lock                                 |  7 +--
 4 files changed, 57 insertions(+), 62 deletions(-)

diff --git a/helpers/dao/wrappers/govern/governor.ts b/helpers/dao/wrappers/govern/governor.ts
index 6cc3ac25..4a986f7c 100644
--- a/helpers/dao/wrappers/govern/governor.ts
+++ b/helpers/dao/wrappers/govern/governor.ts
@@ -1,28 +1,28 @@
 import {
   findTransactionAddress,
   GOKI_ADDRESSES,
-  GOKI_CODERS,
-} from "@gokiprotocol/client";
-import { TransactionEnvelope } from "@saberhq/solana-contrib";
-import { u64 } from "@saberhq/token-utils";
-import type { PublicKey, TransactionInstruction } from "@solana/web3.js";
-import { SystemProgram } from "@solana/web3.js";
-import type BN from "bn.js";
+  GOKI_CODERS
+} from '@gokiprotocol/client';
+import { TransactionEnvelope } from '@saberhq/solana-contrib';
+import { u64 } from '@saberhq/token-utils';
+import type { PublicKey, TransactionInstruction } from '@solana/web3.js';
+import { SystemProgram } from '@solana/web3.js';
+import { PendingProposal } from '@tribecahq/tribeca-sdk';
+import type BN from 'bn.js';
 
 import type {
   GovernanceParameters,
   GovernorData,
   ProposalData,
   ProposalInstruction,
-  ProposalMetaData,
-} from "../../programs/govern";
-import type { TribecaSDK } from "../../sdk";
-import type { PendingProposal } from "../simpleVoter/types";
+  ProposalMetaData
+} from '../../programs/govern';
+import type { TribecaSDK } from '../../sdk';
 import {
   findProposalAddress,
   findProposalMetaAddress,
-  findVoteAddress,
-} from "./pda";
+  findVoteAddress
+} from './pda';
 
 /**
  * Wrapper around a Governor.
@@ -80,7 +80,7 @@ export class GovernorWrapper {
     proposal,
     proposer = this.sdk.provider.wallet.publicKey,
     title,
-    descriptionLink,
+    descriptionLink
   }: {
     proposal: PublicKey;
     proposer?: PublicKey;
@@ -98,8 +98,8 @@ export class GovernorWrapper {
           proposer,
           proposalMeta: proposalMetaKey,
           payer: this.provider.wallet.publicKey,
-          systemProgram: SystemProgram.programId,
-        },
+          systemProgram: SystemProgram.programId
+        }
       }
     );
     return this.provider.newTX([ix]);
@@ -111,7 +111,7 @@ export class GovernorWrapper {
    */
   async createProposal({
     proposer = this.sdk.provider.wallet.publicKey,
-    instructions,
+    instructions
   }: {
     proposer?: PublicKey;
     instructions: ProposalInstruction[];
@@ -131,15 +131,15 @@ export class GovernorWrapper {
           proposal,
           proposer,
           payer: provider.wallet.publicKey,
-          systemProgram: SystemProgram.programId,
-        },
+          systemProgram: SystemProgram.programId
+        }
       })
     );
 
     return {
       proposal,
       index,
-      tx: this.provider.newTX(ixs),
+      tx: this.provider.newTX(ixs)
     };
   }
 
@@ -150,7 +150,7 @@ export class GovernorWrapper {
   async queueProposal({
     index,
     smartWalletProgram = GOKI_ADDRESSES.SmartWallet,
-    payer = this.provider.wallet.publicKey,
+    payer = this.provider.wallet.publicKey
   }: {
     index: BN;
     smartWalletProgram?: PublicKey;
@@ -164,7 +164,7 @@ export class GovernorWrapper {
         governorData.smartWallet
       );
     if (!smartWalletDataRaw) {
-      throw new Error("smart wallet not found");
+      throw new Error('smart wallet not found');
     }
     const smartWalletData = GOKI_CODERS.SmartWallet.accountParsers.smartWallet(
       smartWalletDataRaw.data
@@ -182,9 +182,9 @@ export class GovernorWrapper {
           smartWalletProgram,
           transaction: txKey,
           payer,
-          systemProgram: SystemProgram.programId,
-        },
-      }),
+          systemProgram: SystemProgram.programId
+        }
+      })
     ]);
   }
 
@@ -194,7 +194,7 @@ export class GovernorWrapper {
    */
   cancelProposal({
     proposal,
-    proposer = this.sdk.provider.wallet.publicKey,
+    proposer = this.sdk.provider.wallet.publicKey
   }: {
     proposal: PublicKey;
     proposer?: PublicKey;
@@ -204,16 +204,16 @@ export class GovernorWrapper {
         accounts: {
           governor: this.governorKey,
           proposal,
-          proposer,
-        },
-      }),
+          proposer
+        }
+      })
     ]);
   }
 
   async getOrCreateVote({
     proposal,
     voter = this.sdk.provider.wallet.publicKey,
-    payer = this.sdk.provider.wallet.publicKey,
+    payer = this.sdk.provider.wallet.publicKey
   }: {
     proposal: PublicKey;
     voter?: PublicKey;
@@ -234,8 +234,8 @@ export class GovernorWrapper {
           proposal,
           voteKeyAndBump: [voteKey, bump],
           voter,
-          payer,
-        }),
+          payer
+        })
       };
     }
   }
@@ -244,7 +244,7 @@ export class GovernorWrapper {
     proposal,
     voteKeyAndBump,
     voter = this.sdk.provider.wallet.publicKey,
-    payer = this.sdk.provider.wallet.publicKey,
+    payer = this.sdk.provider.wallet.publicKey
   }: {
     proposal: PublicKey;
     voteKeyAndBump?: [PublicKey, number];
@@ -261,8 +261,8 @@ export class GovernorWrapper {
         vote: voteKey,
         proposal,
         payer,
-        systemProgram: SystemProgram.programId,
-      },
+        systemProgram: SystemProgram.programId
+      }
     });
   }
 
@@ -273,8 +273,8 @@ export class GovernorWrapper {
     return this.program.instruction.setGovernanceParams(newParams, {
       accounts: {
         governor: this.governorKey,
-        smartWallet,
-      },
+        smartWallet
+      }
     });
   }
 }
diff --git a/helpers/dao/wrappers/lockedVoter/setup.ts b/helpers/dao/wrappers/lockedVoter/setup.ts
index 89120f50..ead1ad59 100644
--- a/helpers/dao/wrappers/lockedVoter/setup.ts
+++ b/helpers/dao/wrappers/lockedVoter/setup.ts
@@ -1,20 +1,20 @@
-import type { GokiSDK, SmartWalletWrapper } from "@gokiprotocol/client";
-import type { TransactionEnvelope } from "@saberhq/solana-contrib";
-import type { PublicKey } from "@solana/web3.js";
-import { Keypair } from "@solana/web3.js";
+import type { GokiSDK, SmartWalletWrapper } from '@gokiprotocol/client';
+import type { TransactionEnvelope } from '@saberhq/solana-contrib';
+import type { PublicKey } from '@solana/web3.js';
+import { Keypair } from '@solana/web3.js';
 
 import type {
   GovernanceParameters,
   GovernorWrapper,
-  LockerParams,
-} from "../..";
+  LockerParamsV2
+} from '../..';
 import {
   DEFAULT_GOVERNANCE_PARAMETERS,
-  DEFAULT_LOCKER_PARAMS,
-} from "../../constants";
-import type { TribecaSDK } from "../../sdk";
-import { createGovernorWithElectorate } from "../govern/setup";
-import { LockerWrapper } from "./locker";
+  DEFAULT_LOCKER_PARAMS
+} from '../../constants';
+import type { TribecaSDK } from '../../sdk';
+import { createGovernorWithElectorate } from '../govern/setup';
+import { LockerWrapper } from './locker';
 
 /**
  * Creates a new Locker.
@@ -29,14 +29,14 @@ export const createLocker = async ({
   lockerParams = DEFAULT_LOCKER_PARAMS,
   governorBaseKP = Keypair.generate(),
   lockerBaseKP = Keypair.generate(),
-  smartWalletBaseKP = Keypair.generate(),
+  smartWalletBaseKP = Keypair.generate()
 }: {
   sdk: TribecaSDK;
   gokiSDK: GokiSDK;
   govTokenMint: PublicKey;
   owners?: PublicKey[];
   governanceParameters?: Partial<GovernanceParameters>;
-  lockerParams?: Partial<LockerParams>;
+  lockerParams?: Partial<LockerParamsV2>;
   /**
    * Base of the governor.
    */
@@ -59,16 +59,16 @@ export const createLocker = async ({
   }[];
 }> => {
   const { electorate, ...governor } = await createGovernorWithElectorate({
-    createElectorate: async (governorKey) => {
+    createElectorate: async governorKey => {
       const { locker, tx: tx1 } = await sdk.createLocker({
         ...lockerParams,
         baseKP: lockerBaseKP,
         governor: governorKey,
-        govTokenMint,
+        govTokenMint
       });
       return {
         key: locker,
-        tx: tx1,
+        tx: tx1
       };
     },
     sdk,
@@ -76,7 +76,7 @@ export const createLocker = async ({
     owners,
     governanceParameters,
     govBaseKP: governorBaseKP,
-    smartWalletBaseKP,
+    smartWalletBaseKP
   });
   return {
     ...governor,
@@ -84,6 +84,6 @@ export const createLocker = async ({
       sdk,
       electorate,
       governor.governorWrapper.governorKey
-    ),
+    )
   };
 };
diff --git a/package.json b/package.json
index 0e5a30a3..309578fd 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "bn.js": "^5.2.0",
     "date-fns": "^2.28.0",
     "degen": "^0.0.69",
-    "jsbi": "^4.1.0",
+    "jsbi": "^4.3.0",
     "next": "12.1.0",
     "react": "17.0.2",
     "react-countdown": "^2.3.2",
diff --git a/yarn.lock b/yarn.lock
index d839f705..3d33fdf5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4295,16 +4295,11 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsbi@^4:
+jsbi@^4, jsbi@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741"
   integrity sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==
 
-jsbi@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.2.0.tgz#975567e0dd47fdf91bad4b5a681070d15e244b68"
-  integrity sha512-JzhwPkH7Ra8O1b5uHmWxl6N8ZumqGvMXgpKcsq0/iWlnB+KkzbekCIcLl3hu3sFGTLNXAuXIqY4STtE0ZfT1zA==
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"

From 04575298406c5c200b306ae604b26293977c4501 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Thu, 19 May 2022 13:32:55 -0500
Subject: [PATCH 049/101] change vote card color

---
 .../locked-voter/CastVoteButton/CastVoteModal.tsx            | 2 +-
 .../Proposals/ProposalIndexView/locked-voter/VotesCard.tsx   | 2 +-
 components/common/governance/Meter.tsx                       | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
index 926cfbf5..5b68b7eb 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/CastVoteButton/CastVoteModal.tsx
@@ -42,7 +42,7 @@ export const CastVoteModal: React.FC<Props> = ({ proposalInfo }: Props) => {
     const memoIX = createMemoInstruction(reason, [
       escrow.escrowW.provider.wallet.publicKey
     ]);
-    tx.addInstructions(memoIX);
+    tx.append(memoIX);
     const { pending } = await handleTX(tx, `Vote ${VOTE_SIDE_LABEL[side]}`);
     if (!pending) {
       return;
diff --git a/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx b/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
index f711bf3e..efc9fd4f 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/VotesCard.tsx
@@ -61,7 +61,7 @@ export const VotesCard: React.FC<Props> = ({ side, proposal }: Props) => {
           <Meter
             value={voteCount ?? new BN(0)}
             max={BN.max(totalDeterminingVotes ?? new BN(0), new BN(1))}
-            barColor="primary"
+            barColor={side === VoteSide.For ? 'primary' : 'red'}
             // barColor={
             //   side === VoteSide.For
             //     ? theme`colors.primary`
diff --git a/components/common/governance/Meter.tsx b/components/common/governance/Meter.tsx
index 76c902e1..8de5703d 100644
--- a/components/common/governance/Meter.tsx
+++ b/components/common/governance/Meter.tsx
@@ -19,11 +19,12 @@ export const Meter: React.FC<Props> = ({
     typeof value === 'number' && typeof max === 'number'
       ? value / max
       : new Fraction(value, max).asNumber;
+
   return (
     <Box
       className={className}
       flexGrow={1}
-      backgroundColor="accent"
+      backgroundColor="accentSecondary"
       height="1"
       borderRadius="full"
     >
@@ -34,7 +35,7 @@ export const Meter: React.FC<Props> = ({
         }}
         height="1"
         borderRadius="full"
-        backgroundColor="backgroundSecondary"
+        backgroundColor="accent"
         // tw="bg-primary h-1 rounded transition-all"
       />
     </Box>

From 7084b0a715e90b954cb9817676913be8b0695ce3 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Thu, 19 May 2022 14:32:00 -0500
Subject: [PATCH 050/101] conflicts

---
 .../locked-voter/ProposalCreateInner.tsx      |   2 +-
 .../locked-voter/ProposalTXForm.tsx           |   2 +-
 .../ActiveProposalVotingBars.tsx              |  27 +-
 .../Proposals/ProposalsList/ProposalCard.tsx  |  12 +-
 components/Proposals/ProposalsList/index.tsx  |   8 +-
 components/common/governance/Card.tsx         |   3 +-
 icons/PulsingDot.tsx                          |   2 +-
 pages/governance/index.tsx                    | 448 ++++++++----------
 pages/governance/proposals/index.tsx          |  20 +
 9 files changed, 238 insertions(+), 286 deletions(-)

diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
index 76b3e742..86ad7364 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -184,7 +184,7 @@ export const ProposalCreateInner: React.FC = () => {
         </div>
         <Box display="flex" flexDirection="column" gap="4">
           <Card padding="6">
-            <Heading>Proposal Action</Heading>
+            <Heading level="2">Proposal Action</Heading>
             <Box display="grid" gap="4" paddingX="7" paddingY="6">
               <ProposalTXForm
                 setError={setError}
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
index 59853ad8..2e8dca95 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
@@ -20,7 +20,7 @@ export const ProposalTXForm: React.FC<Props> = ({
   txRaw,
   setTxRaw
 }: Props) => {
-  const [actionType, setActionType] = useState<ActionType>('Upgrade Program');
+  const [actionType, setActionType] = useState<ActionType>('Memo');
   const { smartWallet, lockerData, governor } = useGovernor();
   const { ownerInvokerKey } = useExecutiveCouncil();
 
diff --git a/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx b/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
index 5641a3c0..841778f6 100644
--- a/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
+++ b/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
@@ -4,6 +4,7 @@ import BN from 'bn.js';
 import { useGovernor } from 'hooks/tribeca/useGovernor';
 import type { ProposalInfo } from 'hooks/tribeca/useProposals';
 import { formatNumberSI } from 'helpers/format';
+import { Meter } from 'components/common/governance/Meter';
 // import { Meter } from '../../../../../common/Meter';
 
 interface Props {
@@ -34,15 +35,10 @@ export const ActiveProposalVotingBars: React.FC<Props> = ({
         fontWeight="medium"
         color="white"
       >
-        {/* <div tw="w-full flex items-center gap-3 text-xs text-white font-medium h-6"> */}
-        {/* <Meter
-          value={forVotes}
-          max={maxVotes}
-          barColor={theme`colors.primary`}
-        /> */}
-        {/* <div tw="flex-basis[44px]"> */}
-        {formatNumberSI(forVotes)}
-        {/* </div> */}
+        <Meter value={forVotes} max={maxVotes} barColor={'primary'} />
+        <Box display="flex" flexBasis="12">
+          {formatNumberSI(forVotes)}
+        </Box>
       </Box>
       <Box
         width="full"
@@ -52,15 +48,10 @@ export const ActiveProposalVotingBars: React.FC<Props> = ({
         fontWeight="medium"
         color="white"
       >
-        {/* <div tw="w-full flex items-center gap-3 text-xs text-white font-medium h-6"> */}
-        {/* <Meter
-          value={againstVotes}
-          max={maxVotes}
-          barColor={theme`colors.red.500`}
-        /> */}
-        {/* <div tw="flex-basis[44px]"> */}
-        {formatNumberSI(againstVotes)}
-        {/* </div> */}
+        <Meter value={againstVotes} max={maxVotes} barColor={'red'} />
+        <Box display="flex" flexBasis="12">
+          {formatNumberSI(againstVotes)}
+        </Box>
       </Box>
     </Box>
   );
diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
index 251d7060..ba925300 100644
--- a/components/Proposals/ProposalsList/ProposalCard.tsx
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -37,15 +37,15 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
           display="flex"
           alignItems="center"
           gap="5"
-          width={{ md: '192', xs: '3/4' }}
+          // width={{ md: '192', xs: '3/4' }}
           // tw="flex items-center gap-5 w-3/4 md:w-[500px]"
         >
           {state === ProposalState.Active && (
-            <Box width="11" height="11">
-              <PulsingDot color="decendent" />
+            <Box width="11" height="11" color="accent">
+              <PulsingDot />
             </Box>
           )}
-          <div>
+          <Box>
             <Box display="flex" alignItems="center">
               <Text
                 color="white"
@@ -79,10 +79,10 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
                 </Box>
               </Box>
             )}
-          </div>
+          </Box>
         </Box>
         {state === ProposalState.Active && (
-          <Box width="192">
+          <Box width="1/2">
             <ActiveProposalVotingBars proposal={proposalInfo} />
           </Box>
         )}
diff --git a/components/Proposals/ProposalsList/index.tsx b/components/Proposals/ProposalsList/index.tsx
index 486799e5..eb21b955 100644
--- a/components/Proposals/ProposalsList/index.tsx
+++ b/components/Proposals/ProposalsList/index.tsx
@@ -98,7 +98,7 @@ export const ProposalsList: React.FC<Props> = ({
 
   if (proposalCount === 0 || allProposals.length === 0) {
     return (
-      <div>
+      <Box>
         <EmptyState title="There aren't any proposals yet.">
           <Text>
             <Link href={'/governance/proposals/create'} passHref>
@@ -106,13 +106,13 @@ export const ProposalsList: React.FC<Props> = ({
             </Link>
           </Text>
         </EmptyState>
-      </div>
+      </Box>
     );
   }
 
   const pageCount = calcPageTotal(allProposals.length ?? 0);
   return (
-    <>
+    <Box>
       {allProposals
         .slice(startCursor, startCursor + PROPOSALS_PER_PAGE)
         .map((proposal, i) =>
@@ -132,7 +132,7 @@ export const ProposalsList: React.FC<Props> = ({
           numPages={pageCount}
         />
       )}
-    </>
+    </Box>
   );
 };
 
diff --git a/components/common/governance/Card.tsx b/components/common/governance/Card.tsx
index 7516c03c..c07db0b6 100644
--- a/components/common/governance/Card.tsx
+++ b/components/common/governance/Card.tsx
@@ -36,7 +36,6 @@ export const Card: React.FC<Props> = ({
       display="flex"
       flexDirection="column"
       className={className}
-      // tw="rounded bg-warmGray-850 shadow-xl flex flex-col"
     >
       {title && (
         <Box
@@ -85,6 +84,7 @@ export const Card: React.FC<Props> = ({
               fontSize="small"
               fontWeight="bold"
               textTransform="uppercase"
+              color="white"
               // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800"
             >
               {link.title}
@@ -98,6 +98,7 @@ export const Card: React.FC<Props> = ({
             paddingY="5"
             fontSize="small"
             fontWeight="bold"
+            color="white"
             // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800 text-warmGray-600 cursor-not-allowed"
           >
             {link.title}
diff --git a/icons/PulsingDot.tsx b/icons/PulsingDot.tsx
index d281dee7..9907d84b 100644
--- a/icons/PulsingDot.tsx
+++ b/icons/PulsingDot.tsx
@@ -1,4 +1,4 @@
-export const PulsingDot = (props: { color: string }) => (
+export const PulsingDot = (props: { color?: string }) => (
   <svg
     width="44"
     height="44"
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 1ffe401d..0736b399 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -1,16 +1,5 @@
 import type { NextPage } from 'next';
-import {
-  Box,
-  Button,
-  Card,
-  Heading,
-  IconChevronRight,
-  IconExclamation,
-  Input,
-  Stat,
-  Tag,
-  Text
-} from 'degen';
+import { Box, Button, Card, IconExclamation, Stat, Text } from 'degen';
 import { Stack } from 'degen';
 import Layout from '../../components/Layout/Layout';
 import ModalContainer from 'components/ModalContainer/ModalContainer';
@@ -36,8 +25,8 @@ import {
   convertBnTimestampToDate,
   calcVeHoneyAmount
 } from 'helpers/utils';
-import { HIPS } from 'constants/hip-links';
 import { ProposalsList } from 'components/Proposals/ProposalsList';
+import { Card as ProposalContainer } from 'components/common/governance/Card';
 
 const Governance: NextPage = () => {
   const wallet = useConnectedWallet();
@@ -125,272 +114,223 @@ const Governance: NextPage = () => {
 
   return (
     <Layout>
+      {/* Modals */}
+      <ModalContainer
+        onClose={() => setShowPHoneyModal(false)}
+        isVisible={showPHoneyModal}
+      >
+        <PHoneyModal />
+      </ModalContainer>
+      <ModalContainer
+        onClose={() => setShowVeHoneyModal(false)}
+        isVisible={showVeHoneyModal}
+      >
+        <VeHoneyModal />
+      </ModalContainer>
+      <ModalContainer
+        onClose={() => setShowHoneyModal(false)}
+        isVisible={showHoneyModal}
+      >
+        <HoneyModal />
+      </ModalContainer>
       <Stack space="5" flex={1}>
-        {/* Modals */}
-        <ModalContainer
-          onClose={() => setShowPHoneyModal(false)}
-          isVisible={showPHoneyModal}
-        >
-          <PHoneyModal />
-        </ModalContainer>
-        <ModalContainer
-          onClose={() => setShowVeHoneyModal(false)}
-          isVisible={showVeHoneyModal}
-        >
-          <VeHoneyModal />
-        </ModalContainer>
-        <ModalContainer
-          onClose={() => setShowHoneyModal(false)}
-          isVisible={showHoneyModal}
-        >
-          <HoneyModal />
-        </ModalContainer>
-        {/* Page title */}
-        {/* <Box marginTop="5">
-          <Text variant="extraLarge" weight="bold">
-            Vote on new collateral assets
-          </Text>
-        </Box> */}
-        {/* Cards row */}
-        <Box display="flex" width="full">
-          <Card level="2" padding="6" width="full">
+        <Card level="2" padding="6">
+          <Box
+            display="flex"
+            alignItems="center"
+            flexDirection={{ xs: 'column', md: 'row' }}
+            justifyContent="space-between"
+          >
             <Box
               display="flex"
-              alignItems="center"
               flexDirection={{ xs: 'column', md: 'row' }}
-              justifyContent="space-between"
+              alignItems="center"
             >
-              <Box
-                display="flex"
-                flexDirection={{ xs: 'column', md: 'row' }}
-                alignItems="center"
-              >
-                <IconExclamation color="accent" />
-                <Text variant="small" align="center">
-                  Pre-IDO HONEY (pHONEY) can be converted to HONEY at a 1:1
-                  ratio.{' '}
-                  <Text as="span" color="accent">
-                    You can increase this ratio by locking your tokens
-                  </Text>{' '}
-                  (and receive veHONEY). To participate in governance, you can
-                  lock your HONEY for veHONEY.
-                </Text>
-              </Box>
-              <Stack direction="horizontal" justify="center" align="center">
-                <Button
-                  as="a"
-                  href="https://docs.honey.finance/tokenomics/vehoney"
-                  target="_blank"
-                  size="small"
-                  variant="tertiary"
-                >
-                  Learn more
-                </Button>
-              </Stack>
+              <IconExclamation color="accent" />
+              <Text variant="small" align="center">
+                Pre-IDO HONEY (pHONEY) can be converted to HONEY at a 1:1 ratio.{' '}
+                <Text as="span" color="accent">
+                  You can increase this ratio by locking your tokens
+                </Text>{' '}
+                (and receive veHONEY). To participate in governance, you can
+                lock your HONEY for veHONEY.
+              </Text>
             </Box>
-          </Card>
-        </Box>
+            <Stack direction="horizontal" justify="center" align="center">
+              <Button
+                as="a"
+                href="https://docs.honey.finance/tokenomics/vehoney"
+                target="_blank"
+                size="small"
+                variant="tertiary"
+              >
+                Learn more
+              </Button>
+            </Stack>
+          </Box>
+        </Card>
 
         <Stack
           direction={{
-            lg: 'horizontal',
             md: 'horizontal',
-            sm: 'vertical',
-            xs: 'vertical'
+            sm: 'vertical'
           }}
           space="6"
         >
-          <Box
-            height="full"
-            display="flex"
-            alignItems="stretch"
-            width={{ sm: 'full', md: '1/2' }}
-          >
-            //TODO: add maintenance warning??
-            {/* <Card level="2" padding="6">
-              <Box display="flex" height="full">
-                <Stack flex={1} justify="center" align="center" space="3">
-                  <IconExclamation color="accent" />
-                  <Text as="span" color="accent">
-                      Maintenance warning
-                    </Text>{' '}
-                  <Text variant="small" align="center">
-                    Our governance program is {' '}
-                    <Text as="span" color="accent">
-                      currently undergoing a maintenance.
-                    </Text>{' '}
-                    Please wait before converting pHONEY to HONEY, or withdrawing HONEY from the conversion tool.
-                  </Text>
-                  <Stack direction="horizontal" justify="center" align="center">
-                    <Button
-                      as="a"
-                      href="https://discord.gg/honeydefi"
-                      target="_blank"
-                      size="small"
-                      variant="tertiary"
-                    >
-                      Learn more
-                    </Button>
-                  </Stack> */}
-            <Card level="2" padding="6" width="full">
-              <Box display="flex" height="full" width="full">
-                <Stack flex={1} justify="space-around">
-                  <Stat
-                    label="Locked"
-                    value={
-                      <NumberFormat
-                        thousandSeparator
-                        value={1000000000}
-                        displayType={'text'}
-                      />
-                    }
-                    size="small"
-                  />
-                  <Stat
-                    label="Total Supply of veHONEY"
-                    value={
-                      <NumberFormat
-                        thousandSeparator
-                        value={1000000000}
-                        displayType={'text'}
-                      />
-                    }
-                    size="small"
-                  />
-                  <Stat
-                    label="Total Supply of HONEY"
-                    value={
-                      <NumberFormat
-                        thousandSeparator
-                        value={1000000000}
-                        displayType={'text'}
-                      />
-                    }
-                    size="small"
-                  />
-                </Stack>
-              </Box>
-            </Card>
-          </Box>
-          <Box
-            height="full"
-            display="flex"
-            alignItems="stretch"
-            style={{ minWidth: '50%' }}
-            width={{ sm: 'full', md: 'fit' }}
-          >
-            <Card width="full" level="2" padding="6">
-              <Box height="full" width="full" display="flex">
-                <Stack
-                  flex={1}
-                  direction={{
-                    lg: 'horizontal',
-                    md: 'horizontal',
-                    sm: 'horizontal',
-                    xs: 'vertical'
-                  }}
-                  space="3"
+          <Card level="2" padding="6" width="full">
+            <Box display="flex" height="full" width="full">
+              <Stack flex={1} justify="space-around">
+                <Stat
+                  label="Locked"
+                  value={
+                    <NumberFormat
+                      thousandSeparator
+                      value={1000000000}
+                      displayType={'text'}
+                    />
+                  }
+                  size="small"
+                />
+                <Stat
+                  label="Total Supply of veHONEY"
+                  value={
+                    <NumberFormat
+                      thousandSeparator
+                      value={1000000000}
+                      displayType={'text'}
+                    />
+                  }
+                  size="small"
+                />
+                <Stat
+                  label="Total Supply of HONEY"
+                  value={
+                    <NumberFormat
+                      thousandSeparator
+                      value={1000000000}
+                      displayType={'text'}
+                    />
+                  }
+                  size="small"
+                />
+              </Stack>
+            </Box>
+          </Card>
+          <Card width="full" level="2" padding="6">
+            <Box height="full" width="full" display="flex">
+              <Stack
+                flex={1}
+                direction={{
+                  lg: 'horizontal',
+                  md: 'horizontal',
+                  sm: 'horizontal',
+                  xs: 'vertical'
+                }}
+                space="3"
+              >
+                <Box
+                  width={{ lg: '3/4', md: '3/4', xs: 'full', sm: 'full' }}
+                  paddingRight={{ xs: '0', sm: '3' }}
+                  paddingBottom={{ xs: '3', sm: '0' }}
+                  borderBottomWidth={{ xs: '0.375', sm: '0' }}
+                  borderRightWidth={{ xs: '0', sm: '0.375' }}
                 >
-                  <Box
-                    width={{ lg: '3/4', md: '3/4', xs: 'full', sm: 'full' }}
-                    paddingRight={{ xs: '0', sm: '3' }}
-                    paddingBottom={{ xs: '3', sm: '0' }}
-                    borderBottomWidth={{ xs: '0.375', sm: '0' }}
-                    borderRightWidth={{ xs: '0', sm: '0.375' }}
-                  >
-                    <Stack flex={1} justify="space-between" space="6">
-                      <Stack justify="space-between" direction="horizontal">
-                        <Stack align="flex-end">
-                          <Text size="small">
-                            <b>{veHoneyAmount}</b> veHONEY balance
-                          </Text>
-                        </Stack>
+                  <Stack flex={1} justify="space-between" space="6">
+                    <Stack justify="space-between" direction="horizontal">
+                      <Stack align="flex-end">
+                        <Text size="small">
+                          <b>{veHoneyAmount}</b> veHONEY balance
+                        </Text>
+                      </Stack>
 
-                        <Stack align="flex-end">
-                          {/* <Text size="small">$HONEY locked</Text> */}
-                          <Text size="small">
-                            <b>{lockedAmount}</b> $HONEY (locked)
-                          </Text>
-                        </Stack>
+                      <Stack align="flex-end">
+                        {/* <Text size="small">$HONEY locked</Text> */}
+                        <Text size="small">
+                          <b>{lockedAmount}</b> $HONEY (locked)
+                        </Text>
                       </Stack>
-                      <Box marginTop="auto">
-                        <Stack space="3">
-                          <Stack justify="space-between" direction="horizontal">
-                            {/* <Text size="small">Lock period starts</Text> */}
-                            {/* <Text size="small">{lockedPeriodStart}</Text> */}
-                          </Stack>
-                          <Stack justify="space-between" direction="horizontal">
-                            <Text size="small">Lock period ends</Text>
-                            <Text size="small">{lockedPeriodEnd}</Text>
-                          </Stack>
-                          <Stack justify="space-between" direction="horizontal">
-                            <Text size="small">pHONEY deposited:</Text>
-                            <Text size="small">{depositedAmount}</Text>
-                          </Stack>
-                          <Stack justify="space-between" direction="horizontal">
-                            <Text size="small">pHONEY balance</Text>
-                            <Text size="small">{pHoneyAmount}</Text>
-                          </Stack>
-                          <Stack justify="space-between" direction="horizontal">
-                            <Text size="small">HONEY balance</Text>
-                            <Text size="small">{honeyAmount}</Text>
-                          </Stack>
-                        </Stack>
-                      </Box>
                     </Stack>
-                  </Box>
-                  <Stack flex={1} justify="space-around">
-                    <Button
-                      onClick={
-                        wallet ? () => setShowPHoneyModal(true) : connect
-                      }
-                      width="full"
-                      size="small"
-                      variant="secondary"
-                    >
-                      pHONEY → HONEY
-                    </Button>
-                    <Button
-                      onClick={
-                        wallet ? () => setShowVeHoneyModal(true) : connect
-                      }
-                      width="full"
-                      size="small"
-                      variant="secondary"
-                    >
-                      pHONEY → veHONEY
-                    </Button>
-                    <Button
-                      onClick={wallet ? () => setShowHoneyModal(true) : connect}
-                      width="full"
-                      size="small"
-                      variant="secondary"
-                    >
-                      HONEY → veHONEY
-                    </Button>
+                    <Box marginTop="auto">
+                      <Stack space="3">
+                        <Stack justify="space-between" direction="horizontal">
+                          {/* <Text size="small">Lock period starts</Text> */}
+                          {/* <Text size="small">{lockedPeriodStart}</Text> */}
+                        </Stack>
+                        <Stack justify="space-between" direction="horizontal">
+                          <Text size="small">Lock period ends</Text>
+                          <Text size="small">{lockedPeriodEnd}</Text>
+                        </Stack>
+                        <Stack justify="space-between" direction="horizontal">
+                          <Text size="small">pHONEY deposited:</Text>
+                          <Text size="small">{depositedAmount}</Text>
+                        </Stack>
+                        <Stack justify="space-between" direction="horizontal">
+                          <Text size="small">pHONEY balance</Text>
+                          <Text size="small">{pHoneyAmount}</Text>
+                        </Stack>
+                        <Stack justify="space-between" direction="horizontal">
+                          <Text size="small">HONEY balance</Text>
+                          <Text size="small">{honeyAmount}</Text>
+                        </Stack>
+                      </Stack>
+                    </Box>
                   </Stack>
+                </Box>
+                <Stack flex={1} justify="space-around">
+                  <Button
+                    onClick={wallet ? () => setShowPHoneyModal(true) : connect}
+                    width="full"
+                    size="small"
+                    variant="secondary"
+                  >
+                    pHONEY → HONEY
+                  </Button>
+                  <Button
+                    onClick={wallet ? () => setShowVeHoneyModal(true) : connect}
+                    width="full"
+                    size="small"
+                    variant="secondary"
+                  >
+                    pHONEY → veHONEY
+                  </Button>
+                  <Button
+                    onClick={wallet ? () => setShowHoneyModal(true) : connect}
+                    width="full"
+                    size="small"
+                    variant="secondary"
+                  >
+                    HONEY → veHONEY
+                  </Button>
                 </Stack>
-              </Box>
-            </Card>
-          </Box>
+              </Stack>
+            </Box>
+          </Card>
         </Stack>
-        {/* HIP cards container */}
         <Box
           flex={1}
-          padding="10"
           borderRadius="2xLarge"
-          backgroundColor="backgroundTertiary"
+          // padding="10"
+          // backgroundColor="backgroundTertiary"
         >
-          <Text
-            weight="semiBold"
-            variant="large"
-            ellipsis
-            lineHeight="none"
-            whiteSpace="pre-wrap"
+          <ProposalContainer
+            title={
+              <Text
+                weight="semiBold"
+                variant="large"
+                ellipsis
+                lineHeight="none"
+                whiteSpace="pre-wrap"
+              >
+                Recent Proposals
+              </Text>
+            }
+            link={{
+              title: 'View All Proposals',
+              href: '/governance/proposals'
+            }}
           >
-            Recent Proposals
-          </Text>
-          <ProposalsList maxCount={3} />
+            <ProposalsList maxCount={3} />
+          </ProposalContainer>
         </Box>
       </Stack>
     </Layout>
diff --git a/pages/governance/proposals/index.tsx b/pages/governance/proposals/index.tsx
index 75d4ec65..7e1f03cc 100644
--- a/pages/governance/proposals/index.tsx
+++ b/pages/governance/proposals/index.tsx
@@ -2,12 +2,32 @@ import { NextPage } from 'next';
 import { useState } from 'react';
 import { ProposalsList } from 'components/Proposals/ProposalsList';
 import Layout from 'components/Layout/Layout';
+import { Button, IconPlus, Stack, Text } from 'degen';
+import SmallToggleSwitch from 'components/SmallToggleSwitch/SmallToggleSwitch';
+import Link from 'next/link';
 
 const Proposals: NextPage = () => {
   const [showDrafts, setShowDrafts] = useState(true);
 
   return (
     <Layout>
+      <Stack align="center" direction="horizontal" justify="space-between">
+        <Stack align="center" direction="horizontal">
+          <Text variant="large">All proposals</Text>
+          <Link href="/governance/proposals/create" passHref>
+            <Button size="small" shape="circle">
+              <IconPlus />
+            </Button>
+          </Link>
+        </Stack>
+        <Stack align="center" direction="horizontal">
+          <SmallToggleSwitch
+            isActive={showDrafts}
+            setIsActive={setShowDrafts}
+          />
+          <Text variant="label">View Drafts</Text>
+        </Stack>
+      </Stack>
       <ProposalsList showDrafts={showDrafts} />
     </Layout>
   );

From 31a130c0154b40cae0a311748d5e1189239a3f63 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Thu, 19 May 2022 14:53:12 -0500
Subject: [PATCH 051/101] Update token supply value

---
 pages/governance/index.tsx | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 0736b399..2ebf9165 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -27,6 +27,9 @@ import {
 } from 'helpers/utils';
 import { ProposalsList } from 'components/Proposals/ProposalsList';
 import { Card as ProposalContainer } from 'components/common/governance/Card';
+import { useTokenAmount, useTokenMint } from '@saberhq/sail';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { TokenAmount } from '@saberhq/token-utils';
 
 const Governance: NextPage = () => {
   const wallet = useConnectedWallet();
@@ -36,11 +39,30 @@ const Governance: NextPage = () => {
   const [showHoneyModal, setShowHoneyModal] = useState(false);
 
   const { tokenAccounts } = useAccounts();
-
   // ======================== Should replace with configuration ================
   const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
   const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
 
+  const { govToken, veToken, lockedSupply } = useGovernor();
+  const totalVeTokens = useTokenAmount(veToken, '0');
+  const { data: govTokenData } = useTokenMint(govToken?.mintAccount);
+  const totalSupplyFmt =
+    govTokenData && govToken
+      ? new TokenAmount(govToken, govTokenData.account.supply).format({
+          numberFormatOptions: {
+            maximumFractionDigits: 0
+          }
+        })
+      : govTokenData;
+
+  const lockedSupplyFmt = lockedSupply
+    ? lockedSupply.format({
+        numberFormatOptions: {
+          maximumFractionDigits: 0
+        }
+      })
+    : lockedSupply;
+
   const STAKE_POOL_ADDRESS = new PublicKey(
     process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
       'Cv9Hx3VRvqkz5JRPiZM8A2BH31yvpcT4qiUJLdtgu7TE'
@@ -185,7 +207,7 @@ const Governance: NextPage = () => {
                   value={
                     <NumberFormat
                       thousandSeparator
-                      value={1000000000}
+                      value={lockedSupplyFmt}
                       displayType={'text'}
                     />
                   }
@@ -196,7 +218,9 @@ const Governance: NextPage = () => {
                   value={
                     <NumberFormat
                       thousandSeparator
-                      value={1000000000}
+                      value={totalVeTokens?.asNumber.toLocaleString(undefined, {
+                        maximumFractionDigits: 0
+                      })}
                       displayType={'text'}
                     />
                   }
@@ -207,7 +231,7 @@ const Governance: NextPage = () => {
                   value={
                     <NumberFormat
                       thousandSeparator
-                      value={1000000000}
+                      value={totalSupplyFmt?.toString()}
                       displayType={'text'}
                     />
                   }

From cfd7a44a0913049c9d985f94a9735d954454c3e3 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Fri, 20 May 2022 10:21:47 -0500
Subject: [PATCH 052/101] Fix build error

---
 .../ExecuteProposalButton.tsx                 | 134 ++++++++++++++++++
 .../ExecutiveCouncilTab/PendingTXs.tsx        |  50 +++++++
 .../ExecutiveCouncilTab/index.tsx             |  18 +++
 .../locked-voter/actions/ProposalExecute.tsx  |  35 ++---
 components/common/AsyncButton.tsx             |  50 +++++++
 components/common/AsyncConfirmButton.tsx      |  69 +++++++++
 package.json                                  |   2 +
 yarn.lock                                     |   5 +
 8 files changed, 347 insertions(+), 16 deletions(-)
 create mode 100644 components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
 create mode 100644 components/GovernanceManageView/ExecutiveCouncilTab/PendingTXs.tsx
 create mode 100644 components/GovernanceManageView/ExecutiveCouncilTab/index.tsx
 create mode 100644 components/common/AsyncButton.tsx
 create mode 100644 components/common/AsyncConfirmButton.tsx

diff --git a/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx b/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
new file mode 100644
index 00000000..26b8f583
--- /dev/null
+++ b/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
@@ -0,0 +1,134 @@
+import type { SmartWalletTransactionData } from '@gokiprotocol/client';
+import { mapSome, useTXHandlers } from '@saberhq/sail';
+import { tsToDate } from '@saberhq/solana-contrib';
+import type { ProgramAccount } from '@saberhq/token-utils';
+import pluralize from 'pluralize';
+import Countdown from 'react-countdown';
+import invariant from 'tiny-invariant';
+
+import { useSDK } from 'helpers/sdk';
+import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { AsyncConfirmButton } from 'components/common/AsyncConfirmButton';
+// import { ProseSmall } from '../../../../../common/typography/Prose';
+import { EmbedTX } from 'components/Proposals/ProposalIndexView/locked-voter/EmbedTX';
+import { Box, Text } from 'degen';
+
+interface Props {
+  tx: ProgramAccount<SmartWalletTransactionData>;
+  onActivate?: () => void;
+}
+
+export const ExecuteProposalButton: React.FC<Props> = ({
+  tx,
+  onActivate
+}: Props) => {
+  const { governorW, smartWallet } = useGovernor();
+  const { ecWallet } = useExecutiveCouncil();
+  const { sdkMut } = useSDK();
+  const { signAndConfirmTX } = useTXHandlers();
+
+  const eta = tsToDate(tx.account.eta);
+  const gracePeriodEnd = mapSome(ecWallet.data, d =>
+    !tx.account.eta.isNeg()
+      ? tsToDate(tx.account.eta.add(d.account.gracePeriod))
+      : null
+  );
+
+  const etaSurpassed = eta <= new Date();
+  const gracePeriodSurpassed = !!mapSome(gracePeriodEnd, g => g <= new Date());
+
+  const disabledReason = !governorW
+    ? 'No governor'
+    : !ecWallet.data
+    ? 'No EC wallet'
+    : !etaSurpassed
+    ? 'ETA not surpassed'
+    : gracePeriodSurpassed
+    ? 'Grace period surpassed'
+    : null;
+
+  return (
+    <AsyncConfirmButton
+      modal={{
+        title: 'Execute Proposal',
+        // style: tw`max-w-4xl`,
+        contents: (
+          <Box>
+            {/* <ProseSmall tw="text-center"> */}
+            <Text as="p">
+              You are about to execute the following{' '}
+              {pluralize('instruction', tx.account.instructions.length)} on
+              behalf of the DAO:
+            </Text>
+            {/* </ProseSmall> */}
+            <Box width="full" overflow="scroll">
+              <EmbedTX txKey={tx.publicKey} />
+            </Box>
+            <Box textAlign="center">
+              <Text as="p">
+                There will be two instructions for you to sign: the first is to
+                approve the proposal for execution by the smart wallet, and the
+                second is to execute the transaction on behalf of the smart
+                wallet.
+              </Text>
+            </Box>
+          </Box>
+        )
+      }}
+      disabled={
+        !governorW ||
+        !ecWallet.data ||
+        !etaSurpassed ||
+        gracePeriodSurpassed ||
+        !!disabledReason
+      }
+      // tw="w-3/4"
+      variant="primary"
+      onClick={async () => {
+        invariant(governorW && sdkMut && smartWallet && ecWallet.data);
+        const sw = await sdkMut.loadSmartWallet(ecWallet.data.publicKey);
+        const [invoker] = await sw.findOwnerInvokerAddress(0);
+        const invokeTX = await sw.ownerInvokeInstructionV2({
+          instruction: sdkMut.programs.SmartWallet.instruction.approve({
+            accounts: {
+              smartWallet: smartWallet,
+              transaction: tx.publicKey,
+              owner: invoker
+            }
+          }),
+          index: 0
+        });
+        await signAndConfirmTX(invokeTX, 'Approve Proposal');
+
+        const executeTX = await (
+          await sdkMut.loadSmartWallet(smartWallet)
+        ).executeTransaction({
+          transactionKey: tx.publicKey,
+          owner: invoker
+        });
+        const executeIX = executeTX.instructions[0];
+        invariant(executeIX, 'executed');
+        const executeInvoke = await sw.ownerInvokeInstructionV2({
+          instruction: executeIX,
+          index: 0
+        });
+
+        await signAndConfirmTX(executeInvoke, 'Execute Proposal');
+        onActivate?.();
+      }}
+    >
+      {disabledReason ??
+        (!etaSurpassed ? (
+          <>
+            <Box marginRight="1">
+              <Text as="span">ETA in</Text>
+            </Box>
+            <Countdown date={eta} />
+          </>
+        ) : (
+          'Execute Proposal'
+        ))}
+    </AsyncConfirmButton>
+  );
+};
diff --git a/components/GovernanceManageView/ExecutiveCouncilTab/PendingTXs.tsx b/components/GovernanceManageView/ExecutiveCouncilTab/PendingTXs.tsx
new file mode 100644
index 00000000..c8e2819a
--- /dev/null
+++ b/components/GovernanceManageView/ExecutiveCouncilTab/PendingTXs.tsx
@@ -0,0 +1,50 @@
+import { mapSome } from '@saberhq/sail';
+import { tsToDate } from '@saberhq/solana-contrib';
+import { Box } from 'degen';
+
+import { useSmartWallet } from 'hooks/useSmartWallet';
+// import { TableCardBody } from "../../../../../common/card/TableCardBody";
+// import { EmptyState } from "../../../../../common/EmptyState";
+// import { LoadingPage } from "../../../../../common/LoadingPage";
+import { ExecuteProposalButton } from './ExecuteProposalButton';
+
+export const PendingTXs: React.FC = () => {
+  const { parsedTXs, smartWalletData } = useSmartWallet();
+
+  const pendingTXs = parsedTXs?.filter(tx => {
+    if (!tx.tx) {
+      return false;
+    }
+    const gracePeriodEnd = mapSome(tx.tx, t =>
+      mapSome(smartWalletData, d =>
+        !t.account.eta.isNeg()
+          ? tsToDate(t.account.eta.add(d.account.gracePeriod))
+          : null
+      )
+    );
+    if (gracePeriodEnd && gracePeriodEnd <= new Date()) {
+      return false;
+    }
+    return tx.tx?.account.executedAt.isNeg() ?? false;
+  });
+
+  return (
+    <Box width="full">
+      <table>
+        {pendingTXs?.map(tx => (
+          <tr key={tx.tx.publicKey.toString()}>
+            <td>TX-{tx.tx.account.index.toNumber()}</td>
+            <td>{tx.instructions.map(ix => ix.title).join(', ')}</td>
+            <td>
+              <ExecuteProposalButton tx={tx.tx} />
+            </td>
+          </tr>
+        ))}
+      </table>
+      {/* {pendingTXs?.length === 0 && (
+        <EmptyState title="No pending transactions found." />
+      )}
+      {pendingTXs === undefined && <LoadingPage />} */}
+    </Box>
+  );
+};
diff --git a/components/GovernanceManageView/ExecutiveCouncilTab/index.tsx b/components/GovernanceManageView/ExecutiveCouncilTab/index.tsx
new file mode 100644
index 00000000..c5765d8c
--- /dev/null
+++ b/components/GovernanceManageView/ExecutiveCouncilTab/index.tsx
@@ -0,0 +1,18 @@
+import { Box } from 'degen';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { SmartWalletProvider } from 'hooks/useSmartWallet';
+import { Card } from 'components/common/governance/Card';
+import { PendingTXs } from './PendingTXs';
+
+export const ExecutiveCouncilTab: React.FC = () => {
+  const { smartWallet } = useGovernor();
+  return (
+    <SmartWalletProvider initialState={smartWallet ?? undefined}>
+      <Box display="flex" flexDirection="column" gap="4">
+        <Card title="Pending Transactions">
+          <PendingTXs />
+        </Card>
+      </Box>
+    </SmartWalletProvider>
+  );
+};
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
index f3997069..7d1c8a28 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
@@ -1,21 +1,22 @@
+import Link from 'next/link';
 import { mapSome, useTXHandlers } from '@saberhq/sail';
-// import pluralize from 'pluralize';
+import { Box, Button, Text } from 'degen';
 import Countdown from 'react-countdown';
+// import invariant from 'tiny-invariant';
+// import pluralize from 'pluralize';
 
-// import { useSDK } from 'helpers/sdk';
+import { useSDK } from 'helpers/sdk';
 import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
-// import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
 import type { ProposalInfo } from 'hooks/tribeca/useProposals';
 import { useGokiTransactionData } from 'helpers/parser';
-import { tsToDate } from 'helpers/utils';
+import { gokiTXLink, tsToDate } from 'helpers/utils';
 // import { AsyncConfirmButton } from '../../../../../../common/AsyncConfirmButton';
 // import { Card } from '../../../../../../common/governance/Card';
 // import { ExternalLink } from '../../../../../../common/typography/ExternalLink';
 // import { ProseSmall } from '../../../../../../common/typography/Prose';
-// import { ExecuteProposalButton } from '../../../../GovernanceManageView/tabs/ExecutiveCouncilTab/ExecuteProposalButton';
+import { ExecuteProposalButton } from 'components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton';
 import { Card } from 'components/common/governance/Card';
-import { Box, Text } from 'degen';
-import Link from 'next/link';
 
 interface Props {
   proposal: ProposalInfo;
@@ -26,9 +27,9 @@ export const ProposalExecute: React.FC<Props> = ({
   proposal,
   onActivate
 }: Props) => {
-  // const { governorW, smartWallet } = useGovernor();
+  const { sdkMut } = useSDK();
+  const { governorW, smartWallet } = useGovernor();
   // const emergencyDAO = manifest?.addresses?.['emergency-dao']?.address;
-  // const { sdkMut } = useSDK();
   const { ecWallet, isMemberOfEC } = useExecutiveCouncil();
   const { data: gokiTransactionData } = useGokiTransactionData(
     proposal.proposalData.queuedTransaction
@@ -89,18 +90,20 @@ export const ProposalExecute: React.FC<Props> = ({
             <Countdown date={eta} />.
           </Text>
         )}
-        {/* <ExternalLink tw="mb-4" href={gokiTXLink(gokiTransactionData.account)}>
-          View on Goki
-        </ExternalLink> */}
+        <Box marginBottom="4">
+          <Link href={gokiTXLink(gokiTransactionData.account)} passHref>
+            <Button variant="transparent">View on Goki</Button>
+          </Link>
+        </Box>
         {/* </ProseSmall> */}
-        {/* {isMemberOfEC && (
+        {isMemberOfEC && (
           <Box
             display="flex"
             justifyContent="space-between"
             alignItems="center"
             marginBottom="8"
           >
-            {gracePeriodSurpassed && emergencyDAO && (
+            {/* {gracePeriodSurpassed && (
               <AsyncConfirmButton
                 modal={{
                   title: 'Revive Proposal via Emergency DAO',
@@ -161,13 +164,13 @@ export const ProposalExecute: React.FC<Props> = ({
                   'Revive Proposal via Emergency DAO'
                 )}
               </AsyncConfirmButton>
-            )}
+            )} */}
             <ExecuteProposalButton
               tx={gokiTransactionData}
               onActivate={onActivate}
             />
           </Box>
-        )} */}
+        )}
       </Box>
     </Card>
   );
diff --git a/components/common/AsyncButton.tsx b/components/common/AsyncButton.tsx
new file mode 100644
index 00000000..c724f0e6
--- /dev/null
+++ b/components/common/AsyncButton.tsx
@@ -0,0 +1,50 @@
+import type { GokiSDK } from '@gokiprotocol/client';
+import { useWalletKit } from '@gokiprotocol/walletkit';
+import { Button } from 'degen';
+import { Props as ButtonProps } from 'degen/dist/types/components/Button';
+
+import { useSDK } from 'helpers/sdk';
+
+interface Props extends Omit<ButtonProps, 'onClick'> {
+  onClick?: (sdkMut: GokiSDK) => Promise<void> | void;
+  connectWalletOverride?: string;
+}
+
+export const AsyncButton: React.FC<Props> = ({
+  onClick,
+  children,
+  connectWalletOverride,
+  tone,
+  ...rest
+}: Props) => {
+  const { connect } = useWalletKit();
+  const { sdkMut } = useSDK();
+  return sdkMut !== null ? (
+    <Button
+      size="small"
+      variant="primary"
+      width="full"
+      onClick={
+        onClick
+          ? async () => {
+              await onClick(sdkMut);
+            }
+          : undefined
+      }
+      {...rest}
+    >
+      {children}
+    </Button>
+  ) : (
+    <Button
+      size="small"
+      variant="tertiary"
+      width="full"
+      {...rest}
+      disabled={false}
+      onClick={() => connect()}
+    >
+      {connectWalletOverride ?? 'Connect Wallet'}
+    </Button>
+  );
+};
diff --git a/components/common/AsyncConfirmButton.tsx b/components/common/AsyncConfirmButton.tsx
new file mode 100644
index 00000000..aa603faf
--- /dev/null
+++ b/components/common/AsyncConfirmButton.tsx
@@ -0,0 +1,69 @@
+import type { Interpolation, Theme } from '@emotion/react';
+import { useState } from 'react';
+
+import { AsyncButton } from './AsyncButton';
+import { Modal } from '../Modal';
+import { Box } from 'degen';
+
+type Props = React.ComponentProps<typeof AsyncButton> & {
+  modal: {
+    title: string;
+    disabled?: boolean;
+    contents: React.ReactNode;
+    style?: Interpolation<Theme>;
+    innerStyles?: Interpolation<Theme>;
+  };
+};
+
+export const AsyncConfirmButton: React.FC<Props> = ({
+  children,
+  onClick,
+  modal: { title, contents, disabled, style: modalStyle, innerStyles },
+  ...buttonProps
+}: Props) => {
+  const [showModal, setShowModal] = useState<boolean>(false);
+  return (
+    <>
+      <Modal
+        isOpen={showModal}
+        onDismiss={() => {
+          setShowModal(false);
+        }}
+        // css={modalStyle}
+      >
+        <Box
+          borderBottomWidth="px"
+          borderColor="black"
+          color="white"
+          fontSize="base"
+          fontWeight="bold"
+          textAlign="center"
+          paddingY="4"
+        >
+          {title}
+        </Box>
+        <Box
+          padding="8"
+          display="flex"
+          flexDirection="column"
+          alignItems="center"
+        >
+          {contents}
+          <Box marginTop="8" width="full">
+            <AsyncButton {...buttonProps} disabled={disabled} onClick={onClick}>
+              {title}
+            </AsyncButton>
+          </Box>
+        </Box>
+      </Modal>
+      <AsyncButton
+        {...buttonProps}
+        onClick={() => {
+          setShowModal(true);
+        }}
+      >
+        {children}
+      </AsyncButton>
+    </>
+  );
+};
diff --git a/package.json b/package.json
index 309578fd..4f3d13f0 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "degen": "^0.0.69",
     "jsbi": "^4.3.0",
     "next": "12.1.0",
+    "pluralize": "^8.0.0",
     "react": "17.0.2",
     "react-countdown": "^2.3.2",
     "react-dom": "17.0.2",
@@ -59,6 +60,7 @@
   },
   "devDependencies": {
     "@types/node": "17.0.21",
+    "@types/pluralize": "^0.0.29",
     "@types/react": "17.0.39",
     "eslint": "^8.10.0",
     "eslint-config-next": "12.1.0",
diff --git a/yarn.lock b/yarn.lock
index 3d33fdf5..6757f19a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1317,6 +1317,11 @@
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
+"@types/pluralize@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/pluralize/-/pluralize-0.0.29.tgz#6ffa33ed1fc8813c469b859681d09707eb40d03c"
+  integrity sha512-BYOID+l2Aco2nBik+iYS4SZX0Lf20KPILP5RGmM1IgzdwNdTs0eebiFriOPcej1sX9mLnSoiNte5zcFxssgpGA==
+
 "@types/promise-retry@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@types/promise-retry/-/promise-retry-1.1.3.tgz#baab427419da9088a1d2f21bf56249c21b3dd43c"

From 2f4df80d9227ca2ff78c06d499af6b782b1ea116 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Mon, 23 May 2022 13:06:05 -0500
Subject: [PATCH 053/101] conflicts

---
 components/AddressLink.tsx                    |  75 +++++
 .../ExecuteProposalButton.tsx                 |   2 +-
 .../EmbedTX/InstructionPreview.tsx            |  13 +-
 .../EmbedTX/InstructionsInner.tsx             |   8 +-
 .../locked-voter/EmbedTX/index.tsx            |   6 +-
 .../locked-voter/ProposalHistory.tsx          |  24 +-
 .../locked-voter/actions/ProposalExecute.tsx  |   8 +-
 .../locked-voter/actions/ProposalQueue.tsx    |   3 +-
 .../Proposals/ProposalsList/ProposalCard.tsx  |  13 +-
 components/common/governance/Card.tsx         |  51 +--
 .../common/program/AddressWithContext.tsx     | 191 +++++++++++
 components/common/program/ProgramLabel.tsx    |  25 ++
 components/common/program/SolAmount.tsx       |  16 +
 components/common/program/sol.tsx             |  30 ++
 .../InstructionDisplay/Box.tsx                |  29 ++
 .../InstructionDisplay/IXAccounts.tsx         |  93 ++++++
 .../InstructionDisplay/IXArguments.tsx        |  49 +++
 .../InstructionDisplay/index.tsx              |  41 +++
 components/tx/TransactionView/context.tsx     | 164 +++++++++
 helpers/error.ts                              | 221 ++++++++++++
 helpers/programError.ts                       | 316 ++++++++++++++++++
 helpers/utils.ts                              |   4 +
 hooks/goki/useSubaccountInfo.ts               |  21 ++
 hooks/useSignaturesForAddress.ts              |  24 ++
 hooks/useTransactions.ts                      |  26 ++
 pages/_app.tsx                                |  12 +-
 26 files changed, 1397 insertions(+), 68 deletions(-)
 create mode 100644 components/AddressLink.tsx
 create mode 100644 components/common/program/AddressWithContext.tsx
 create mode 100644 components/common/program/ProgramLabel.tsx
 create mode 100644 components/common/program/SolAmount.tsx
 create mode 100644 components/common/program/sol.tsx
 create mode 100644 components/tx/TransactionView/TransactionIndexView/InstructionDisplay/Box.tsx
 create mode 100644 components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXAccounts.tsx
 create mode 100644 components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXArguments.tsx
 create mode 100644 components/tx/TransactionView/TransactionIndexView/InstructionDisplay/index.tsx
 create mode 100644 components/tx/TransactionView/context.tsx
 create mode 100644 helpers/error.ts
 create mode 100644 helpers/programError.ts
 create mode 100644 hooks/goki/useSubaccountInfo.ts
 create mode 100644 hooks/useSignaturesForAddress.ts
 create mode 100644 hooks/useTransactions.ts

diff --git a/components/AddressLink.tsx b/components/AddressLink.tsx
new file mode 100644
index 00000000..c3b07b1f
--- /dev/null
+++ b/components/AddressLink.tsx
@@ -0,0 +1,75 @@
+import styled from '@emotion/styled';
+import { useConnectionContext } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+// import copy from 'copy-to-clipboard';
+
+// import { notify } from "../../utils/notifications";
+import { displayAddress, shortenAddress } from 'helpers/utils';
+import { Box, IconDuplicate, Text } from 'degen';
+
+interface Props {
+  address: PublicKey;
+  className?: string;
+  showCopy?: boolean;
+  children?: React.ReactNode;
+  showRaw?: boolean;
+  shorten?: boolean;
+  prefixLinkUrlWithAnchor?: boolean;
+}
+
+export const AddressLink: React.FC<Props> = ({
+  address,
+  className,
+  shorten = true,
+  showCopy = false,
+  showRaw = true,
+  prefixLinkUrlWithAnchor = false,
+  children
+}: Props) => {
+  const { network } = useConnectionContext();
+  const urlPrefix = prefixLinkUrlWithAnchor
+    ? 'https://anchor.so'
+    : 'https://explorer.solana.com';
+  return (
+    <Wrapper alignItems="center">
+      <a
+        className={className}
+        // tw="text-gray-800 dark:text-warmGray-200 hover:text-primary"
+        href={`${urlPrefix}/address/${address.toString()}?cluster=${
+          network?.toString() ?? ''
+        }`}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <Text as="span">
+          {children ??
+            (showRaw
+              ? shorten
+                ? shortenAddress(address.toString())
+                : address.toString()
+              : displayAddress(address.toString(), shorten))}
+        </Text>
+      </a>
+      {showCopy && (
+        <Box
+          marginLeft="1"
+          onClick={e => {
+            e.preventDefault();
+            e.stopPropagation();
+            // copy(address.toString());
+            // notify({ message: 'Copied address to clipboard.' });
+          }}
+        >
+          <CopyIcon />
+        </Box>
+      )}
+    </Wrapper>
+  );
+};
+const Wrapper = styled(Box)`
+  display: inline-flex;
+`;
+
+const CopyIcon = styled(IconDuplicate)`
+  cursor: pointer;
+`;
diff --git a/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx b/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
index 26b8f583..eb2e8278 100644
--- a/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
+++ b/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
@@ -62,7 +62,7 @@ export const ExecuteProposalButton: React.FC<Props> = ({
               behalf of the DAO:
             </Text>
             {/* </ProseSmall> */}
-            <Box width="full" overflow="scroll">
+            <Box width="full">
               <EmbedTX txKey={tx.publicKey} />
             </Box>
             <Box textAlign="center">
diff --git a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx
index f8f06105..b45c020e 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionPreview.tsx
@@ -1,11 +1,12 @@
+import { Box, Text } from 'degen';
 import { startCase } from 'lodash';
 
 import { useParsedInstruction } from 'hooks/useParsedInstruction';
 import type { ParsedInstruction } from 'hooks/useSmartWallet';
 import { shortenAddress } from 'helpers/utils';
-// import { AddressLink } from 'components/common/AddressLink';
+import { AddressLink } from 'components/AddressLink';
+import { InstructionDisplay } from 'components/tx/TransactionView/TransactionIndexView/InstructionDisplay';
 // import { InstructionDisplay } from '../../../../../wallet/tx/TransactionView/TransactionIndexView/InstructionDisplay';
-import { Box, Text } from 'degen';
 
 interface Props {
   index: number;
@@ -42,13 +43,13 @@ export const InstructionPreview: React.FC<Props> = ({
           <Text as="span" weight="medium">
             Program:
           </Text>{' '}
-          {/* <AddressLink
-            tw="font-semibold text-secondary"
+          <AddressLink
+            // tw="font-semibold text-secondary"
             address={instruction.ix.programId}
           >
             {instruction.programName} (
             {shortenAddress(instruction.ix.programId.toString())})
-          </AddressLink> */}
+          </AddressLink>
         </Text>
       </Box>
       <Box
@@ -56,7 +57,7 @@ export const InstructionPreview: React.FC<Props> = ({
         borderTopWidth="px"
         // tw="p-4 border-t dark:border-t-warmGray-600"
       >
-        {/* <InstructionDisplay parsed={parsed} instruction={instruction} /> */}
+        <InstructionDisplay parsed={parsed} instruction={instruction} />
       </Box>
     </Box>
   );
diff --git a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx
index 3e5b0be9..85ebf66c 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/InstructionsInner.tsx
@@ -1,18 +1,18 @@
 import { Box } from 'degen';
-// import { useTransaction } from '../../../../../wallet/tx/TransactionView/context';
+import { useTransaction } from 'components/tx/TransactionView/context';
 import { InstructionPreview } from './InstructionPreview';
 
 export const InstructionsInner: React.FC = () => {
-  // const { instructions } = useTransaction();
+  const { instructions } = useTransaction();
   return (
     <Box display="grid" gap="4">
-      {/* {instructions?.map((instruction, i) => (
+      {instructions?.map((instruction, i) => (
         <InstructionPreview
           key={`ix_${i}`}
           instruction={instruction}
           index={i}
         />
-      ))} */}
+      ))}
     </Box>
   );
 };
diff --git a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx
index c8aa8ae2..7ed01934 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/EmbedTX/index.tsx
@@ -3,7 +3,7 @@ import { Box, Spinner } from 'degen';
 
 import { useParsedTXByKey } from 'hooks/useParsedTX';
 import { SmartWalletProvider } from 'hooks/useSmartWallet';
-// import { TransactionProvider } from '../../../../../wallet/tx/TransactionView/context';
+import { TransactionProvider } from 'components/tx/TransactionView/context';
 import { InstructionsInner } from './InstructionsInner';
 
 interface Props {
@@ -17,9 +17,9 @@ export const EmbedTX: React.FC<Props> = ({ txKey }: Props) => {
       {isLoading && !parsedTX && <Spinner />}
       {parsedTX && (
         <SmartWalletProvider initialState={parsedTX.tx.account.smartWallet}>
-          {/* <TransactionProvider initialState={parsedTX}>
+          <TransactionProvider initialState={parsedTX}>
             <InstructionsInner />
-          </TransactionProvider> */}
+          </TransactionProvider>
         </SmartWalletProvider>
       )}
     </Box>
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
index 658c36de..f6b074f1 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalHistory.tsx
@@ -8,11 +8,12 @@ import {
 } from 'helpers/dao';
 import BN from 'bn.js';
 import { startCase } from 'lodash';
-import { Box, IconLink, Text } from 'degen';
+import { Box, Button, IconLink, Text } from 'degen';
 
 import type { ProposalInfo } from 'hooks/tribeca/useProposals';
 import { useGokiTransactionData } from 'helpers/parser';
 import { Card } from 'components/common/governance/Card';
+import Link from 'next/link';
 
 const ZERO = new BN(0);
 interface Props {
@@ -114,14 +115,19 @@ export const ProposalHistory: React.FC<Props> = ({
                 </Text>
               </Box>
               {link && (
-                <a
-                  href={link}
-                  // tw="text-primary hover:text-white transition-colors"
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  <IconLink />
-                </a>
+                <Link href={link} passHref>
+                  <Button
+                    href={link}
+                    size="small"
+                    // tone="green"
+                    variant="transparent"
+                    // tw="text-primary hover:text-white transition-colors"
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    <IconLink />
+                  </Button>
+                </Link>
               )}
             </Box>
           </Box>
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
index 7d1c8a28..554b013c 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalExecute.tsx
@@ -1,6 +1,6 @@
 import Link from 'next/link';
 import { mapSome, useTXHandlers } from '@saberhq/sail';
-import { Box, Button, Text } from 'degen';
+import { Box, Button, IconLink, Text } from 'degen';
 import Countdown from 'react-countdown';
 // import invariant from 'tiny-invariant';
 // import pluralize from 'pluralize';
@@ -90,9 +90,11 @@ export const ProposalExecute: React.FC<Props> = ({
             <Countdown date={eta} />.
           </Text>
         )}
-        <Box marginBottom="4">
+        <Box marginY="4">
           <Link href={gokiTXLink(gokiTransactionData.account)} passHref>
-            <Button variant="transparent">View on Goki</Button>
+            <Button variant="transparent" size="small" suffix={<IconLink />}>
+              View on Goki
+            </Button>
           </Link>
         </Box>
         {/* </ProseSmall> */}
diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx
index cd5794c5..b0b7e8de 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalQueue.tsx
@@ -33,11 +33,12 @@ export const ProposalQueue: React.FC<Props> = ({
             .
           </Text>
         </Box>
-        <Box display="flex" alignItems="center" justifyContent="space-between">
+        <Box display="flex" alignItems="center" justifyContent="center">
           <Button
             width="3/4"
             disabled={!governorW}
             variant="primary"
+            size="small"
             onClick={async () => {
               invariant(governorW);
               const tx = await governorW.queueProposal({
diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
index ba925300..ad1e299c 100644
--- a/components/Proposals/ProposalsList/ProposalCard.tsx
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -20,18 +20,13 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
   const router = useRouter();
   const { state, executed } = proposalInfo.status;
   return (
-    <Link
-      passHref
-      href={`${router.pathname}/proposals/${proposalInfo.index}`}
-      // tw="flex items-center justify-between py-5 px-6 border-l-2 border-l-transparent border-b border-b-warmGray-800 cursor-pointer hover:border-l-primary"
-    >
+    <Link passHref href={`${router.pathname}/proposals/${proposalInfo.index}`}>
       <Box
         display="flex"
         alignItems="center"
         justifyContent="space-between"
         paddingX="6"
         paddingY="5"
-        // as={Link}
       >
         <Box
           display="flex"
@@ -47,11 +42,7 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
           )}
           <Box>
             <Box display="flex" alignItems="center">
-              <Text
-                color="white"
-                lineHeight="1.375"
-                // tw="text-white leading-snug break-words hyphens[auto]"
-              >
+              <Text color="white" lineHeight="1.375">
                 {proposalInfo.proposalMetaData?.title.slice(
                   0,
                   PROPOSAL_TITLE_MAX_LEN
diff --git a/components/common/governance/Card.tsx b/components/common/governance/Card.tsx
index c07db0b6..899e8eb9 100644
--- a/components/common/governance/Card.tsx
+++ b/components/common/governance/Card.tsx
@@ -1,4 +1,4 @@
-import { Box, Text } from 'degen';
+import { Box, Button, Text } from 'degen';
 import Link from 'next/link';
 
 import { HelperCard } from '../HelperCard';
@@ -69,13 +69,27 @@ export const Card: React.FC<Props> = ({
         {children}
       </Box>
       {/* </ErrorBoundary> */}
-      {link &&
-        (link.href ? (
-          <Box
-            as={Link}
-            href={link.href}
-            color={{ base: 'white', hover: 'textPrimary' }}
-          >
+      {link && (
+        <Box width="full">
+          {link.href ? (
+            <Link href={link.href} passHref>
+              <Button variant="transparent" center width="full">
+                {/* <Box
+                display="flex"
+                alignItems="center"
+                justifyContent="center"
+                paddingY="5"
+                fontSize="small"
+                fontWeight="bold"
+                textTransform="uppercase"
+                color="white"
+                // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800"
+              > */}
+                {link.title}
+                {/* </Box> */}
+              </Button>
+            </Link>
+          ) : (
             <Box
               display="flex"
               alignItems="center"
@@ -83,27 +97,14 @@ export const Card: React.FC<Props> = ({
               paddingY="5"
               fontSize="small"
               fontWeight="bold"
-              textTransform="uppercase"
               color="white"
-              // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800"
+              // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800 text-warmGray-600 cursor-not-allowed"
             >
               {link.title}
             </Box>
-          </Box>
-        ) : (
-          <Box
-            display="flex"
-            alignItems="center"
-            justifyContent="center"
-            paddingY="5"
-            fontSize="small"
-            fontWeight="bold"
-            color="white"
-            // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800 text-warmGray-600 cursor-not-allowed"
-          >
-            {link.title}
-          </Box>
-        ))}
+          )}
+        </Box>
+      )}
     </Box>
   );
 };
diff --git a/components/common/program/AddressWithContext.tsx b/components/common/program/AddressWithContext.tsx
new file mode 100644
index 00000000..8b402cdd
--- /dev/null
+++ b/components/common/program/AddressWithContext.tsx
@@ -0,0 +1,191 @@
+import { ACCOUNT_DISCRIMINATOR_SIZE } from '@project-serum/anchor/dist/cjs/coder';
+import { SuperCoder } from '@saberhq/anchor-contrib';
+import { useAccountData } from '@saberhq/sail';
+import type { KeyedAccountInfo, PublicKey } from '@solana/web3.js';
+import { SystemProgram } from '@solana/web3.js';
+import { startCase } from 'lodash';
+import { useMemo } from 'react';
+import { Spinner, Stack, Text } from 'degen';
+import Link from 'next/link';
+
+import { useSubaccountInfo } from 'hooks/goki/useSubaccountInfo';
+import { useIDL } from 'hooks/useIDLs';
+import { AddressLink } from '../../AddressLink';
+import { ProgramLabel } from './ProgramLabel';
+import { SolAmount } from './SolAmount';
+import { SYSVAR_OWNER } from 'helpers/utils';
+
+type AccountValidator = (account: KeyedAccountInfo) => string | undefined;
+
+export const createFeePayerValidator = (
+  feeLamports: number
+): AccountValidator => {
+  return (account: KeyedAccountInfo): string | undefined => {
+    if (!account.accountInfo.owner.equals(SystemProgram.programId))
+      return 'Only system-owned accounts can pay fees';
+    // TODO: Actually nonce accounts can pay fees too
+    if (account.accountInfo.data.length > 0)
+      return 'Only unallocated accounts can pay fees';
+    if (account.accountInfo.lamports < feeLamports) {
+      return 'Insufficient funds for fees';
+    }
+    return;
+  };
+};
+
+export const programValidator = (
+  account: KeyedAccountInfo
+): string | undefined => {
+  if (!account.accountInfo.executable)
+    return 'Only executable accounts can be invoked';
+  return;
+};
+
+interface Props {
+  className?: string;
+  pubkey: PublicKey;
+  validator?: AccountValidator;
+  prefixLinkUrlWithAnchor?: boolean;
+}
+
+export const AddressWithContext = ({
+  className,
+  pubkey,
+  validator,
+  prefixLinkUrlWithAnchor = false
+}: Props) => {
+  const info = useAccountData(pubkey);
+  return (
+    <Stack>
+      {info.data?.accountInfo.executable ? (
+        <ProgramLabel
+          address={pubkey}
+          showCopy
+          showRaw={false}
+          shorten={false}
+        />
+      ) : (
+        <AddressLink
+          // tw="dark:text-primary hover:text-opacity-80 font-mono"
+          address={pubkey}
+          showCopy
+          showRaw={false}
+          shorten={false}
+          prefixLinkUrlWithAnchor={prefixLinkUrlWithAnchor}
+        />
+      )}
+      <AccountInfo pubkey={pubkey} validator={validator} />
+    </Stack>
+  );
+};
+
+interface Props {
+  pubkey: PublicKey;
+  validator?: AccountValidator;
+}
+
+export const AccountInfo = ({ pubkey, validator }: Props) => {
+  const info = useAccountData(pubkey);
+  const { data: idl } = useIDL(info.data?.accountInfo.owner);
+  const subaccountInfo = useSubaccountInfo(pubkey);
+
+  const accountName = useMemo(() => {
+    if (!idl?.idl || !info.data) {
+      return null;
+    }
+    const discriminator = info.data.accountInfo.data
+      .slice(0, ACCOUNT_DISCRIMINATOR_SIZE)
+      .toString('hex');
+    const sc = new SuperCoder(idl.programID, idl.idl);
+    return sc.discriminators[discriminator] ?? null;
+  }, [idl?.idl, idl?.programID, info.data]);
+
+  if (!info.data) {
+    if (info.loading || subaccountInfo.isLoading) {
+      return (
+        <Text
+          as="span"
+          // tw="text-gray-600 dark:text-gray-300"
+        >
+          <Spinner />
+          {/* <span className="spinner-grow spinner-grow-sm me-2"></span> */}
+          Loading
+        </Text>
+      );
+    } else {
+      if (subaccountInfo.data) {
+        const subaccountData = subaccountInfo.data.account;
+        return (
+          <span>
+            {startCase(Object.keys(subaccountData.subaccountType)[0])} #
+            {subaccountData.index.toString()} of Smart Wallet{' '}
+            <Link
+              // tw="text-primary hover:text-white transition-colors"
+              href={`/address/${subaccountData.smartWallet.toString()}`}
+            >
+              {subaccountData.smartWallet.toString()}
+            </Link>
+            .
+          </span>
+        );
+      }
+      return <span>Account not found</span>;
+    }
+  }
+
+  const errorMessage = validator && validator(info.data);
+  if (errorMessage)
+    return (
+      <Text as="span" color="accent">
+        {errorMessage}
+      </Text>
+    );
+
+  if (info.data.accountInfo.executable) {
+    return (
+      <Text
+        as="span"
+        //  tw="text-gray-600 dark:text-gray-300"
+      >
+        Executable Program
+      </Text>
+    );
+  }
+
+  const owner = info.data.accountInfo.owner;
+
+  return (
+    <Text
+      as="span"
+      //  tw="text-gray-600 dark:text-gray-300"
+    >
+      {owner ? (
+        <>
+          {owner.equals(SYSVAR_OWNER) ? (
+            'Sysvar.'
+          ) : (
+            <>
+              {accountName ? (
+                <>
+                  <Link
+                    // tw="text-primary hover:text-white transition-colors"
+                    href={`/address/${info.data.accountId.toString()}`}
+                  >
+                    {accountName}
+                  </Link>{' '}
+                  o
+                </>
+              ) : (
+                'O'
+              )}
+              wned by <ProgramLabel address={owner} />.
+            </>
+          )}{' '}
+          Balance is <SolAmount lamports={info.data.accountInfo.lamports} />.
+        </>
+      ) : (
+        "Account doesn't exist"
+      )}
+    </Text>
+  );
+};
diff --git a/components/common/program/ProgramLabel.tsx b/components/common/program/ProgramLabel.tsx
new file mode 100644
index 00000000..f2921de9
--- /dev/null
+++ b/components/common/program/ProgramLabel.tsx
@@ -0,0 +1,25 @@
+import { useProgramLabel } from 'hooks/useProgramMeta';
+import { SYSVAR_OWNER } from 'helpers/utils';
+import { AddressLink } from '../../AddressLink';
+
+type Props = React.ComponentProps<typeof AddressLink>;
+
+/**
+ * Renders a program label.
+ * @returns
+ */
+export const ProgramLabel: React.FC<Props> = ({ address, ...rest }: Props) => {
+  const label = useProgramLabel(address);
+  if (address.equals(SYSVAR_OWNER)) {
+    return <>SYSVAR</>;
+  }
+  return (
+    <AddressLink
+      // tw="dark:text-primary hover:text-opacity-80"
+      address={address}
+      {...rest}
+    >
+      {label}
+    </AddressLink>
+  );
+};
diff --git a/components/common/program/SolAmount.tsx b/components/common/program/SolAmount.tsx
new file mode 100644
index 00000000..ef40305a
--- /dev/null
+++ b/components/common/program/SolAmount.tsx
@@ -0,0 +1,16 @@
+import { lamportsToSolString } from "./sol";
+
+interface Props {
+  lamports: number;
+}
+
+const SYMBOL = "◎";
+
+export const SolAmount: React.FC<Props> = ({ lamports }: Props) => {
+  return (
+    <>
+      {SYMBOL}
+      {lamportsToSolString(lamports)}
+    </>
+  );
+};
diff --git a/components/common/program/sol.tsx b/components/common/program/sol.tsx
new file mode 100644
index 00000000..e109ac42
--- /dev/null
+++ b/components/common/program/sol.tsx
@@ -0,0 +1,30 @@
+import { LAMPORTS_PER_SOL } from "@solana/web3.js";
+import type BN from "bn.js";
+
+export function lamportsToSol(lamports: number | BN): number {
+  if (typeof lamports === "number") {
+    return Math.abs(lamports) / LAMPORTS_PER_SOL;
+  }
+
+  let signMultiplier = 1;
+  if (lamports.isNeg()) {
+    signMultiplier = -1;
+  }
+
+  const absLamports = lamports.abs();
+  const lamportsString = absLamports.toString(10).padStart(10, "0");
+  const splitIndex = lamportsString.length - 9;
+  const solString =
+    lamportsString.slice(0, splitIndex) +
+    "." +
+    lamportsString.slice(splitIndex);
+  return signMultiplier * parseFloat(solString);
+}
+
+export function lamportsToSolString(
+  lamports: number | BN,
+  maximumFractionDigits = 9
+): string {
+  const sol = lamportsToSol(lamports);
+  return new Intl.NumberFormat("en-US", { maximumFractionDigits }).format(sol);
+}
diff --git a/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/Box.tsx b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/Box.tsx
new file mode 100644
index 00000000..d3845c85
--- /dev/null
+++ b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/Box.tsx
@@ -0,0 +1,29 @@
+import { Box as DegenBox, Text } from 'degen';
+interface Props {
+  title: string;
+  children?: React.ReactNode;
+  className?: string;
+}
+
+export const Box: React.FC<Props> = ({ title, children, className }: Props) => (
+  <DegenBox borderWidth="px" borderRadius="medium" fontSize="small">
+    <DegenBox paddingX="6" paddingY="2">
+      <Text
+        as="h2"
+        weight="semiBold"
+        // tw="px-6 py-2 font-semibold text-gray-800 dark:text-gray-100"
+      >
+        {title}
+      </Text>
+    </DegenBox>
+    <DegenBox
+      paddingX="6"
+      paddingY="2"
+      borderTopWidth="px"
+      className={className}
+      // tw="px-6 py-2 border-t border-t-gray-150 dark:border-t-warmGray-600"
+    >
+      {children}
+    </DegenBox>
+  </DegenBox>
+);
diff --git a/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXAccounts.tsx b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXAccounts.tsx
new file mode 100644
index 00000000..41cd0c93
--- /dev/null
+++ b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXAccounts.tsx
@@ -0,0 +1,93 @@
+import type { PublicKey } from '@solana/web3.js';
+import { Box as DegenBox, Text } from 'degen';
+
+import { AddressWithContext } from 'components/common/program/AddressWithContext';
+import { Box } from './Box';
+
+interface Props {
+  accounts: {
+    name?: string;
+    pubkey: PublicKey;
+    isSigner: boolean;
+    isWritable: boolean;
+  }[];
+}
+
+export const IXAccounts: React.FC<Props> = ({ accounts }: Props) => {
+  return (
+    <Box title={`Accounts (${accounts.length})`}>
+      <DegenBox whiteSpace="nowrap">
+        {accounts.map((account, i) => {
+          return (
+            <DegenBox
+              paddingX="6"
+              paddingY="2"
+              alignItems="center"
+              justifyContent="space-between"
+              borderTopWidth="px"
+              key={`account_${i}`}
+              // tw="px-6 py-2 flex items-center gap-4 justify-between border-t border-t-gray-150 dark:border-t-warmGray-600"
+            >
+              <DegenBox display="flex" alignItems="center" gap="4">
+                <Text as="span" weight="semiBold">
+                  {account.name ?? `Account #${i}`}
+                </Text>
+                <DegenBox display="flex" alignItems="center" gap="2">
+                  {account.isWritable && (
+                    <DegenBox
+                      borderWidth="px"
+                      paddingX="2"
+                      paddingY="0.5"
+                      borderRadius="full"
+                      fontSize="small"
+                      fontWeight="medium"
+                      alignItems="center"
+                      gap="2"
+                    >
+                      <DegenBox
+                        width="2"
+                        height="2"
+                        backgroundColor="accent"
+                        borderRadius="full"
+                      />
+                      <Text as="span">writable</Text>
+                    </DegenBox>
+                  )}
+                  {account.isSigner && (
+                    <DegenBox
+                      borderWidth="px"
+                      paddingX="2"
+                      paddingY="0.5"
+                      borderRadius="medium"
+                      display="flex"
+                      alignItems="center"
+                      gap="2"
+                    >
+                      <DegenBox
+                        width="2"
+                        height="2"
+                        backgroundColor="accent"
+                        borderRadius="full"
+                      />
+                      <Text as="span">signer</Text>
+                    </DegenBox>
+                  )}
+                </DegenBox>
+              </DegenBox>
+              <DegenBox
+                fontWeight="medium"
+                flexShrink={0}
+                // tw="text-gray-800 font-medium flex-shrink-0"
+              >
+                <AddressWithContext
+                  pubkey={account.pubkey}
+                  prefixLinkUrlWithAnchor
+                />
+              </DegenBox>
+            </DegenBox>
+          );
+        })}
+      </DegenBox>
+    </Box>
+  );
+};
diff --git a/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXArguments.tsx b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXArguments.tsx
new file mode 100644
index 00000000..8f5cf6a4
--- /dev/null
+++ b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/IXArguments.tsx
@@ -0,0 +1,49 @@
+import { Box as DegenBox, Text } from 'degen';
+import { Box } from './Box';
+
+interface Props {
+  args: { name: string; type: string; data: string }[];
+}
+
+export const IXArguments: React.FC<Props> = ({ args }: Props) => {
+  return (
+    <Box title={`Arguments (${args.length})`}>
+      {args.map((arg, i) => {
+        return (
+          <DegenBox
+            key={`arg_${i}`}
+            // tw="px-6 py-2 flex items-center justify-between border-t border-t-gray-150 dark:border-t-warmGray-600 gap-4"
+            // css={[arg.type.includes('<') && tw`flex-col items-start gap-2`]}
+          >
+            <DegenBox display="flex" gap="4" flexShrink={0}>
+              <Text
+                as="span"
+                weight="semiBold"
+                // tw="text-gray-500 font-semibold"
+              >
+                {arg.name}
+              </Text>
+              <Text
+                as="code"
+                weight="medium"
+                font="mono"
+                // tw="text-gray-500 font-medium font-mono"
+              >
+                {arg.type}
+              </Text>
+            </DegenBox>
+            <DegenBox
+              fontWeight="medium"
+              flexShrink={1}
+              flexWrap="wrap"
+              wordBreak="break-word"
+              //  tw="text-gray-800 dark:text-white font-medium flex-shrink flex-wrap word-break[break-word]"
+            >
+              {arg.data}
+            </DegenBox>
+          </DegenBox>
+        );
+      })}
+    </Box>
+  );
+};
diff --git a/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/index.tsx b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/index.tsx
new file mode 100644
index 00000000..e9eb04f7
--- /dev/null
+++ b/components/tx/TransactionView/TransactionIndexView/InstructionDisplay/index.tsx
@@ -0,0 +1,41 @@
+import { Box as DegenBox } from 'degen';
+import type { RichParsedInstruction } from 'hooks/useParsedInstruction';
+import type { ParsedInstruction } from 'hooks/useSmartWallet';
+import { Box } from './Box';
+import { IXAccounts } from './IXAccounts';
+import { IXArguments } from './IXArguments';
+// import { IXData } from './IXData';
+
+interface Props {
+  instruction: ParsedInstruction;
+  parsed: RichParsedInstruction;
+}
+
+export const InstructionDisplay: React.FC<Props> = ({
+  instruction,
+  parsed
+}: Props) => {
+  return (
+    <DegenBox display="grid" gap="4">
+      {/* {parsed.data.type === 'raw' && (
+        <IXData
+          data={Buffer.from(parsed.data.data)}
+          error={
+            instruction.parsed && 'error' in instruction.parsed
+              ? instruction.parsed.error
+              : null
+          }
+        />
+      )} */}
+      {parsed.data.type === 'anchor' && <IXArguments args={parsed.data.args} />}
+      {/* {parsed.data.type === 'object' && (
+        <Box title="Arguments">
+          <AttributeList
+            attributes={parsed.data.args as Record<string, unknown>}
+          />
+        </Box>
+      )} */}
+      <IXAccounts accounts={parsed.accounts} />
+    </DegenBox>
+  );
+};
diff --git a/components/tx/TransactionView/context.tsx b/components/tx/TransactionView/context.tsx
new file mode 100644
index 00000000..8623873c
--- /dev/null
+++ b/components/tx/TransactionView/context.tsx
@@ -0,0 +1,164 @@
+import type {
+  SmartWalletEvents,
+  SmartWalletTransactionData
+} from '@gokiprotocol/client';
+import { SolanaProvider, TransactionEnvelope } from '@saberhq/solana-contrib';
+import type { ProgramAccount } from '@saberhq/token-utils';
+import { useSolana } from '@saberhq/use-solana';
+import type { TransactionResponse } from '@solana/web3.js';
+import { PublicKey } from '@solana/web3.js';
+import { useMemo } from 'react';
+import { createContainer } from 'unstated-next';
+
+import { useSignaturesForAddress } from 'hooks/useSignaturesForAddress';
+import type { ParsedTX } from 'hooks/useSmartWallet';
+import { SMART_WALLET_CODER, useSmartWallet } from 'hooks/useSmartWallet';
+import { useTransactions } from 'hooks/useTransactions';
+import { displayAddress, shortenAddress } from 'helpers/utils';
+
+interface LoadedTransaction extends ParsedTX {
+  tx: ProgramAccount<SmartWalletTransactionData>;
+}
+
+export interface DetailedTransaction extends LoadedTransaction {
+  index: number;
+  id: string;
+  title: string;
+  historicalTXs?: HistoricalTX[];
+  eta: Date | null;
+  executedAt: Date | null;
+  txEnv: TransactionEnvelope | null;
+  state: 'stale' | 'active' | 'approved' | 'executed';
+  numSigned: number;
+}
+
+export interface HistoricalTX extends TransactionResponse {
+  sig: string;
+  date: Date | null | undefined;
+  events: readonly SmartWalletEvent[];
+}
+
+export type SmartWalletEvent = SmartWalletEvents[keyof SmartWalletEvents];
+
+const useTransactionInner = (tx?: LoadedTransaction): DetailedTransaction => {
+  if (!tx) {
+    throw new Error(`missing tx`);
+  }
+  const { smartWalletData } = useSmartWallet();
+  const { provider, providerMut, network } = useSolana();
+  const index = tx.tx.account.index.toNumber();
+
+  const id = `TX-${index}`;
+  const title = `${
+    tx.instructions
+      ?.map(
+        ix =>
+          (ix.parsed && 'name' in ix.parsed
+            ? `${
+                ix.programName ?? displayAddress(ix.ix.programId.toString())
+              }: ${ix.parsed.name.toString()}`
+            : null) ??
+          `Interact with ${
+            ix.programName ?? shortenAddress(ix.ix.programId.toString())
+          }`
+      )
+      .join(', ') ?? 'Unknown Transaction'
+  }`;
+
+  const txData = tx.tx.account;
+
+  const txEnv = useMemo(() => {
+    if (tx.tx.account.instructions.length === 0) {
+      return null;
+    }
+    return new TransactionEnvelope(
+      providerMut ??
+        SolanaProvider.load({
+          connection: provider.connection,
+          sendConnection: provider.connection,
+          wallet: {
+            publicKey:
+              network === 'devnet'
+                ? new PublicKey('A2jaCHPzD6346348JoEym2KFGX9A7uRBw6AhCdX7gTWP')
+                : new PublicKey('9u9iZBWqGsp5hXBxkVZtBTuLSGNAG9gEQLgpuVw39ASg'),
+            signTransaction: () => {
+              throw new Error('unimplemented');
+            },
+            signAllTransactions: () => {
+              throw new Error('unimplemented');
+            }
+          }
+        }),
+      tx.tx.account.instructions.map(ix => ({
+        ...ix,
+        data: Buffer.from(ix.data)
+      }))
+    );
+  }, [network, provider.connection, providerMut, tx.tx.account.instructions]);
+
+  const etaRaw = txData.eta.toNumber();
+  const eta = etaRaw === -1 ? null : new Date(etaRaw * 1_000);
+  const executedAtNum = tx.tx.account.executedAt.toNumber();
+  const executedAt =
+    executedAtNum === -1 ? null : new Date(executedAtNum * 1_000);
+
+  const sigs = useSignaturesForAddress(tx.tx.publicKey);
+  const historicalTXsRaw = useTransactions(
+    sigs.data?.map(s => s.signature) ?? []
+  );
+
+  const historicalTXs = useMemo(() => {
+    return historicalTXsRaw
+      .map(({ data: resp }): HistoricalTX | null => {
+        if (!resp) {
+          return null;
+        }
+        const events = SMART_WALLET_CODER.parseProgramLogEvents(
+          resp.tx.meta?.logMessages ?? []
+        );
+        return {
+          ...resp.tx,
+          events,
+          sig: resp.sig,
+          date:
+            typeof resp.tx.blockTime === 'number'
+              ? new Date(resp.tx.blockTime * 1_000)
+              : resp.tx.blockTime
+        };
+      })
+      .filter((t): t is HistoricalTX => !!t);
+  }, [historicalTXsRaw]);
+
+  const numSigned = ((tx?.tx.account.signers ?? []) as boolean[]).filter(
+    x => !!x
+  ).length;
+
+  const isOwnerSetValid =
+    tx.tx.account.ownerSetSeqno === smartWalletData?.account.ownerSetSeqno;
+  const threshold = smartWalletData
+    ? smartWalletData.account?.threshold.toNumber()
+    : null;
+  const state = executedAt
+    ? 'executed'
+    : !isOwnerSetValid
+    ? 'stale'
+    : typeof threshold === 'number' && numSigned >= threshold
+    ? 'approved'
+    : 'active';
+
+  return {
+    ...tx,
+    id,
+    index,
+    title,
+    historicalTXs,
+    eta,
+    executedAt,
+    txEnv,
+    state,
+    numSigned
+  };
+};
+
+export const { useContainer: useTransaction, Provider: TransactionProvider } =
+  createContainer(useTransactionInner);
diff --git a/helpers/error.ts b/helpers/error.ts
new file mode 100644
index 00000000..cbb47a89
--- /dev/null
+++ b/helpers/error.ts
@@ -0,0 +1,221 @@
+import { GOKI_ADDRESSES, SmartWalletJSON } from '@gokiprotocol/client';
+import {
+  SailError,
+  SailGetMultipleAccountsError,
+  SailTransactionError
+} from '@saberhq/sail';
+import { extractErrorMessage } from '@saberhq/sail';
+import { PublicKey } from '@solana/web3.js';
+import { mapValues } from 'lodash';
+import { toast } from 'react-toastify';
+import { parseIdlErrors, ProgramError } from './programError';
+import { ProgramKey } from './sdk';
+
+const programErrors = mapValues(
+  {
+    SmartWallet: SmartWalletJSON
+  },
+  prog => parseIdlErrors(prog)
+);
+
+const programIDs = Object.entries({
+  ...GOKI_ADDRESSES
+}).reduce(
+  (acc, [name, prog]: [name: string, prog: PublicKey]) => ({
+    ...acc,
+    [prog.toString()]: name
+  }),
+  {}
+) as Record<string, ProgramKey>;
+
+export class CapturedError extends Error {
+  constructor(
+    override readonly name: string,
+    override readonly message: string,
+    readonly source: string,
+    readonly originalError: unknown
+  ) {
+    super(message);
+  }
+}
+
+export const describeRPCError = (msg: string): string => {
+  try {
+    const result = JSON.parse(msg.substring('503 : '.length)) as {
+      error: {
+        code: string;
+        message: string;
+      };
+    };
+    return `${result.error.message} (${result.error.code})`;
+  } catch (e) {
+    // ignore parse error
+  }
+  return msg;
+};
+
+/**
+ * Captures an exception.
+ */
+export const handleException = (
+  err: unknown,
+  {
+    name = err instanceof Error ? err.name : 'CapturedError',
+    source = name ?? 'unspecified',
+    userMessage,
+    groupInSentry
+  }: {
+    /**
+     * Custom name to apply to the error.
+     */
+    name?: string;
+    /**
+     * Source to apply to the error.
+     */
+    source?: string;
+    /**
+     * Notification to send to the user.
+     */
+    userMessage?: {
+      title: string;
+      /**
+       * Defaults to error's message.
+       */
+      description?: string;
+    };
+    /**
+     * If true, applies a fingerprint to group the errors by source and name.
+     */
+    groupInSentry?: boolean;
+    /**
+     * Additional information to be logged and sent to Sentry.
+     */
+  }
+): void => {
+  const captured = new CapturedError(
+    name,
+    extractErrorMessage(err) ?? 'unknown',
+    source,
+    err
+  );
+
+  console.error(`[${captured.name}] (from ${captured.source})`);
+  console.error(captured);
+  console.error(captured.originalError);
+
+  toast.error({
+    message: userMessage?.title ?? name ?? 'Unknown Error',
+    description: userMessage?.description ?? captured.message,
+    type: 'error'
+  });
+};
+
+const onTxError = (error: SailTransactionError) => {
+  // Log the program error
+  const err = error.originalError as Error;
+  const { tx } = error;
+  if (err.toString().includes(': custom program error:')) {
+    // todo: figure out the duplicates
+    if (error.network !== 'localnet') {
+      console.error(`TX`, tx.generateInspectLink(error.network));
+    }
+    const progError = ProgramError.parse(err, tx, programIDs, programErrors);
+    if (progError) {
+      const message = err.message.split(':')[1] ?? 'Transaction failed';
+      toast.error({
+        message,
+        description: `${progError.message}`,
+        env: error.network,
+        type: 'error'
+      });
+      const sentryArgs = {
+        tags: {
+          program: progError.program ?? 'AnchorInternal',
+          'program.error.code': progError.code,
+          'program.error.name': progError.errorName
+        },
+        extra: {
+          progError,
+          message,
+          originalError: err
+        }
+      } as const;
+      console.error(progError, sentryArgs);
+      // Sentry.captureException(progError, sentryArgs);
+      return;
+    }
+  }
+
+  if (/(.+)?: custom program error: 0x1$/.exec(err.message.toString())) {
+    toast.warn({
+      message: `Insufficient SOL (need more SOL)`,
+      description: error.message,
+      env: error.network
+    });
+    return;
+  } else if (err.message.includes('Signature request denied')) {
+    toast.info({
+      message: `Transaction cancelled`,
+      description: error.message,
+      env: error.network,
+      type: 'info'
+    });
+    return;
+  } else {
+    toast.error({
+      message: `Transaction failed (try again later)`,
+      description: error.message,
+      env: error.network,
+      type: 'error'
+    });
+    const { tx } = error;
+    if (error.network !== 'localnet') {
+      console.error(`TX`, tx.generateInspectLink(error.network));
+    }
+  }
+};
+
+const onGetMultipleAccountsError = (
+  err: SailGetMultipleAccountsError
+): void => {
+  handleException(err, {
+    source: 'onGetMultipleAccountsError',
+    userMessage: {
+      title: 'Error fetching data from Solana',
+      description: describeRPCError((err.originalError as Error).message)
+    }
+  });
+  return;
+};
+
+export const onSailError = (err: SailError) => {
+  switch (err.sailErrorName) {
+    case 'SailTransactionError': {
+      onTxError(err as SailTransactionError);
+      return;
+    }
+    case 'SailGetMultipleAccountsError': {
+      onGetMultipleAccountsError(err as SailGetMultipleAccountsError);
+      return;
+    }
+    case 'SailTransactionSignError': {
+      console.log(err.cause);
+      toast.error({
+        message: `Failed to sign transaction.${err.cause}`
+      });
+      return;
+    }
+    case 'SailAccountParseError': {
+      // don't log account parsing errors
+      console.debug('SailAccountParseError', err);
+      return;
+    }
+  }
+  handleException(err, {
+    source: 'sail.unknown',
+    userMessage: {
+      title: err.title,
+      description: err.message
+    }
+  });
+};
diff --git a/helpers/programError.ts b/helpers/programError.ts
new file mode 100644
index 00000000..566380ea
--- /dev/null
+++ b/helpers/programError.ts
@@ -0,0 +1,316 @@
+import type { Idl } from '@project-serum/anchor';
+import type { AnchorError } from '@saberhq/anchor-contrib';
+import type { TransactionEnvelope } from '@saberhq/solana-contrib';
+import {
+  ASSOCIATED_TOKEN_PROGRAM_ID,
+  TOKEN_PROGRAM_ID
+} from '@saberhq/token-utils';
+import type { PublicKey, TransactionInstruction } from '@solana/web3.js';
+
+import type { ProgramKey } from 'helpers/sdk';
+
+export class IdlError extends Error {}
+
+export type KnownProgram = ProgramKey | 'Token' | 'AToken' | 'StableSwap';
+
+export type ProgramErrorRepr = AnchorError<Idl> & {
+  displayMessage: string;
+};
+
+export function parseIdlErrors(idl: Idl): Map<number, ProgramErrorRepr> {
+  const errors = new Map<number, ProgramErrorRepr>();
+  if (idl.errors) {
+    idl.errors.forEach(e => {
+      const msg = e.msg ?? e.name;
+      errors.set(e.code, { ...e, displayMessage: msg });
+    });
+  }
+  return errors;
+}
+
+// An error from a user defined program.
+export class ProgramError extends Error {
+  constructor(
+    readonly errorInfo: ProgramErrorRepr,
+    readonly underlying: string,
+    readonly program?: KnownProgram
+  ) {
+    super(errorInfo.displayMessage);
+    this.name = `${program ?? 'Anchor'}ProgramError`;
+  }
+
+  static parse(
+    err: Error,
+    txEnv: TransactionEnvelope,
+    programIDs: Record<string, ProgramKey>,
+    programErrors: { [K in ProgramKey]?: Map<number, ProgramErrorRepr> },
+    programNameOverride?: ProgramKey
+  ): ProgramError | null {
+    // TODO: don't rely on the error string. web3.js should preserve the error
+    //       code information instead of giving us an untyped string.
+    const components = err.toString().split(': custom program error: ');
+    if (components.length !== 2) {
+      return null;
+    }
+
+    let errorCode: number;
+    try {
+      if (!components[1]) {
+        return null;
+      }
+      errorCode = parseInt(components[1]);
+    } catch (parseErr) {
+      return null;
+    }
+
+    // Parse user error.
+    const parts = components[0]?.split(' ');
+    const instructionIdxStr = parts?.[parts.length - 1];
+    let instruction: TransactionInstruction;
+    try {
+      if (!instructionIdxStr) {
+        return null;
+      }
+      const inst = txEnv.instructions[parseInt(instructionIdxStr)];
+      if (!inst) {
+        return null;
+      }
+      instruction = inst;
+    } catch (e) {
+      return null;
+    }
+
+    const errantProgramId = instruction.programId;
+    const programName =
+      programNameOverride ??
+      (errantProgramId ? programIDs[errantProgramId.toString()] : null);
+    const idlErrors = programName ? programErrors[programName] : null;
+    if (programName) {
+      const errorInfo = idlErrors?.get(errorCode);
+      if (errorInfo !== undefined) {
+        return new ProgramError(errorInfo, err.toString(), programName);
+      }
+    }
+
+    return parseError(errantProgramId, errorCode, err);
+  }
+
+  get code(): number {
+    return this.errorInfo.code;
+  }
+
+  get errorName(): string {
+    return this.errorInfo.name;
+  }
+
+  override toString(): string {
+    return this.errorInfo.displayMessage;
+  }
+}
+
+const LangErrorCode = {
+  // Instructions.
+  InstructionMissing: 100,
+  InstructionFallbackNotFound: 101,
+  InstructionDidNotDeserialize: 102,
+  InstructionDidNotSerialize: 103,
+
+  // IDL instructions.
+  IdlInstructionStub: 120,
+  IdlInstructionInvalidProgram: 121,
+
+  // Constraints.
+  ConstraintMut: 140,
+  ConstraintBelongsTo: 141,
+  ConstraintSigner: 142,
+  ConstraintRaw: 143,
+  ConstraintOwner: 144,
+  ConstraintRentExempt: 145,
+  ConstraintSeeds: 146,
+  ConstraintExecutable: 147,
+  ConstraintState: 148,
+  ConstraintAssociated: 149,
+  ConstraintAssociatedInit: 150,
+  ConstraintClose: 151,
+
+  // Accounts.
+  AccountDiscriminatorAlreadySet: 160,
+  AccountDiscriminatorNotFound: 161,
+  AccountDiscriminatorMismatch: 162,
+  AccountDidNotDeserialize: 163,
+  AccountDidNotSerialize: 164,
+  AccountNotEnoughKeys: 165,
+  AccountNotMutable: 166,
+  AccountNotProgramOwned: 167,
+
+  // State.
+  StateInvalidAddress: 180,
+
+  // Used for APIs that shouldn't be used anymore.
+  Deprecated: 299
+};
+
+const codesToName: Record<number, string> = Object.entries(
+  LangErrorCode
+).reduce(
+  (acc, el) => ({
+    ...acc,
+    [el[1]]: el[0]
+  }),
+  {}
+);
+
+const LangErrorMessage = new Map([
+  // Instructions.
+  [
+    LangErrorCode.InstructionMissing,
+    '8 byte instruction identifier not provided'
+  ],
+  [
+    LangErrorCode.InstructionFallbackNotFound,
+    'Fallback functions are not supported'
+  ],
+  [
+    LangErrorCode.InstructionDidNotDeserialize,
+    'The program could not deserialize the given instruction'
+  ],
+  [
+    LangErrorCode.InstructionDidNotSerialize,
+    'The program could not serialize the given instruction'
+  ],
+
+  // Idl instructions.
+  [
+    LangErrorCode.IdlInstructionStub,
+    'The program was compiled without idl instructions'
+  ],
+  [
+    LangErrorCode.IdlInstructionInvalidProgram,
+    'The transaction was given an invalid program for the IDL instruction'
+  ],
+
+  // Constraints.
+  [LangErrorCode.ConstraintMut, 'A mut constraint was violated'],
+  [LangErrorCode.ConstraintBelongsTo, 'A belongs_to constraint was violated'],
+  [LangErrorCode.ConstraintSigner, 'A signer constraint was violated'],
+  [LangErrorCode.ConstraintRaw, 'A raw constraint as violated'],
+  [LangErrorCode.ConstraintOwner, 'An owner constraint was violated'],
+  [LangErrorCode.ConstraintRentExempt, 'A rent exempt constraint was violated'],
+  [LangErrorCode.ConstraintSeeds, 'A seeds constraint was violated'],
+  [LangErrorCode.ConstraintExecutable, 'An executable constraint was violated'],
+  [LangErrorCode.ConstraintState, 'A state constraint was violated'],
+  [LangErrorCode.ConstraintAssociated, 'An associated constraint was violated'],
+  [
+    LangErrorCode.ConstraintAssociatedInit,
+    'An associated init constraint was violated'
+  ],
+  [LangErrorCode.ConstraintClose, 'A close constraint was violated'],
+
+  // Accounts.
+  [
+    LangErrorCode.AccountDiscriminatorAlreadySet,
+    'The account discriminator was already set on this account'
+  ],
+  [
+    LangErrorCode.AccountDiscriminatorNotFound,
+    'No 8 byte discriminator was found on the account'
+  ],
+  [
+    LangErrorCode.AccountDiscriminatorMismatch,
+    '8 byte discriminator did not match what was expected'
+  ],
+  [LangErrorCode.AccountDidNotDeserialize, 'Failed to deserialize the account'],
+  [LangErrorCode.AccountDidNotSerialize, 'Failed to serialize the account'],
+  [
+    LangErrorCode.AccountNotEnoughKeys,
+    'Not enough account keys given to the instruction'
+  ],
+  [LangErrorCode.AccountNotMutable, 'The given account is not mutable'],
+  [
+    LangErrorCode.AccountNotProgramOwned,
+    'The given account is not owned by the executing program'
+  ],
+
+  // State.
+  [
+    LangErrorCode.StateInvalidAddress,
+    'The given state account does not have the correct address'
+  ],
+
+  // Misc.
+  [
+    LangErrorCode.Deprecated,
+    'The API being used is deprecated and should no longer be used'
+  ]
+]);
+
+export const handlers: Record<
+  string,
+  {
+    name: KnownProgram;
+    displayMessage: (code: number) => string | undefined;
+  }
+> = {
+  [TOKEN_PROGRAM_ID.toString()]: {
+    name: 'Token' as const,
+    displayMessage: (code: number): string | undefined => {
+      switch (code) {
+        case 1:
+          return 'Insufficient token balance (need more SOL)';
+      }
+    }
+  },
+  [ASSOCIATED_TOKEN_PROGRAM_ID.toString()]: {
+    name: 'AToken' as const,
+    displayMessage: (code: number): string | undefined => {
+      switch (code) {
+        case 1:
+          return 'Insufficient token balance (need more SOL)';
+      }
+    }
+  }
+};
+
+/**
+ * Parses an error into a ProgramError if possible.
+ * @param errantProgramID
+ * @param code
+ * @param err
+ * @returns
+ */
+export const parseError = (
+  errantProgramID: PublicKey,
+  code: number,
+  err: Error
+): ProgramError | null => {
+  const handler = handlers[errantProgramID.toString()];
+  if (handler) {
+    return new ProgramError(
+      {
+        code,
+        displayMessage:
+          handler.displayMessage(code) ?? `unknown (code ${code})`,
+        name: code.toString()
+      },
+      err.toString(),
+      handler.name
+    );
+  }
+
+  // Parse framework internal error.
+  const message = LangErrorMessage.get(code);
+  if (message !== undefined) {
+    return new ProgramError(
+      {
+        code,
+        msg: message,
+        name: codesToName[code] ?? 'AnchorInternalUnknown',
+        displayMessage: message ?? `unknown (code ${code})`
+      },
+      err.toString()
+    );
+  }
+
+  // Unable to parse the error. Just return the untranslated error.
+  return null;
+};
diff --git a/helpers/utils.ts b/helpers/utils.ts
index d98d438c..2b3b3b6f 100644
--- a/helpers/utils.ts
+++ b/helpers/utils.ts
@@ -149,6 +149,10 @@ export const generateInspectLink = (
   )}`;
 };
 
+export const SYSVAR_OWNER = new PublicKey(
+  'Sysvar1111111111111111111111111111111111111'
+);
+
 export enum PROGRAM_NAMES {
   // native built-ins
   ADDRESS_MAP = 'Address Map Program',
diff --git a/hooks/goki/useSubaccountInfo.ts b/hooks/goki/useSubaccountInfo.ts
new file mode 100644
index 00000000..669263c1
--- /dev/null
+++ b/hooks/goki/useSubaccountInfo.ts
@@ -0,0 +1,21 @@
+import { findSubaccountInfoAddress } from '@gokiprotocol/client';
+import type { PublicKey } from '@solana/web3.js';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import { useSubaccountInfoData } from 'helpers/parser';
+
+export const useSubaccountInfo = (key: PublicKey | null | undefined) => {
+  const { data: subaccountInfoKey } = useQuery(
+    ['subaccountInfoKey', key?.toString()],
+    async (): Promise<PublicKey> => {
+      invariant(key);
+      const [sub] = await findSubaccountInfoAddress(key);
+      return sub;
+    },
+    {
+      enabled: !!key
+    }
+  );
+  return useSubaccountInfoData(subaccountInfoKey);
+};
diff --git a/hooks/useSignaturesForAddress.ts b/hooks/useSignaturesForAddress.ts
new file mode 100644
index 00000000..f5ff0e7f
--- /dev/null
+++ b/hooks/useSignaturesForAddress.ts
@@ -0,0 +1,24 @@
+import { useSolana } from '@saberhq/use-solana';
+import type { PublicKey } from '@solana/web3.js';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+export const useSignaturesForAddress = (
+  address: PublicKey | null | undefined
+) => {
+  const { connection, network } = useSolana();
+  return useQuery(
+    ['signaturesForAddress', network, address?.toString()],
+    async () => {
+      invariant(address);
+      return await connection.getSignaturesForAddress(
+        address,
+        undefined,
+        'confirmed'
+      );
+    },
+    {
+      enabled: !!address
+    }
+  );
+};
diff --git a/hooks/useTransactions.ts b/hooks/useTransactions.ts
new file mode 100644
index 00000000..3cff18d8
--- /dev/null
+++ b/hooks/useTransactions.ts
@@ -0,0 +1,26 @@
+import { useSolana } from '@saberhq/use-solana';
+import type { TransactionSignature } from '@solana/web3.js';
+import { useQueries } from 'react-query';
+
+export const useTransactions = (txSigs: TransactionSignature[]) => {
+  const { network, connection } = useSolana();
+  return useQueries(
+    txSigs.map(sig => {
+      return {
+        queryKey: ['txSig', network, sig],
+        queryFn: async () => {
+          const tx = await connection.getTransaction(sig, {
+            commitment: 'confirmed'
+          });
+          if (!tx) {
+            return null;
+          }
+          return {
+            sig,
+            tx
+          };
+        }
+      };
+    })
+  );
+};
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 7939cc29..8f1c1633 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -17,6 +17,7 @@ import { GovernorProvider } from 'hooks/tribeca/useGovernor';
 import 'degen/styles';
 import '../styles/globals.css';
 import 'react-toastify/dist/ReactToastify.css';
+import { onSailError } from 'helpers/error';
 
 const queryClient = new QueryClient();
 const network = process.env.NETWORK as Network;
@@ -77,9 +78,7 @@ function MyApp({ Component, pageProps }: AppProps) {
         >
           <SailProvider
             initialState={{
-              onSailError: err => {
-                console.log(err);
-              }
+              onSailError
             }}
           >
             <SDKProvider>
@@ -95,7 +94,6 @@ function MyApp({ Component, pageProps }: AppProps) {
                 ) : (
                   <>
                     <Component {...pageProps} />
-                    <ToastContainer theme="dark" position="bottom-right" />
                   </>
                 )}
               </GovernorProvider>
@@ -103,9 +101,13 @@ function MyApp({ Component, pageProps }: AppProps) {
           </SailProvider>
         </WalletKitProvider>
       </QueryClientProvider>
+<<<<<<< HEAD
 
+=======
+      <ToastContainer theme="dark" position="bottom-right" />
+>>>>>>> 6d255de (Fix styling)
     </ThemeProvider>
   );
 }
 
-export default MyApp; 
+export default MyApp;

From 79b8143c2195be45577dc10ced9d58fa50f384d7 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Tue, 31 May 2022 09:59:44 +0100
Subject: [PATCH 054/101] proposal stylings

---
 .../locked-voter/ProposalCreateInner.tsx      | 147 ++++++++++--------
 .../{ => ProposalTxForm}/ProposalTXForm.tsx   |   2 +
 .../ProposalTxForm/ProposalTxForm.css.ts      |   9 ++
 .../locked-voter/ProposalBody/index.tsx       |   2 +-
 .../locked-voter/ProposalDetails.tsx          |   8 +-
 .../ProposalIndexView/locked-voter/index.tsx  |   6 +-
 .../Proposals/ProposalsList/ProposalCard.tsx  | 119 +++++++-------
 components/Proposals/ProposalsList/index.tsx  |   2 +-
 components/common/governance/Card.tsx         |  99 +++++-------
 .../common/governance/GovernancePageInner.tsx |  24 +--
 .../proposals/[proposalIndex]/index.tsx       |  16 +-
 pages/governance/proposals/create.tsx         |  18 ++-
 pages/governance/proposals/index.tsx          |   7 +-
 13 files changed, 250 insertions(+), 209 deletions(-)
 rename components/Proposals/ProposalCreateView/locked-voter/{ => ProposalTxForm}/ProposalTXForm.tsx (96%)
 create mode 100644 components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTxForm.css.ts

diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
index 86ad7364..7aba6046 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -6,12 +6,21 @@ import {
 } from '@saberhq/sail';
 import { LAMPORTS_PER_SOL, SystemProgram, Transaction } from '@solana/web3.js';
 import ReactMarkdown from 'react-markdown';
-import { Box, Button, Card, Heading, Input, Textarea, Text } from 'degen';
+import {
+  Box,
+  Button,
+  Card,
+  Heading,
+  Input,
+  Textarea,
+  Text,
+  Stack
+} from 'degen';
 
 import { useExecutiveCouncil } from 'hooks/tribeca/useExecutiveCouncil';
 import { useGovernor } from 'hooks/tribeca/useGovernor';
 import { ProposalConfirmModal } from './ProposalConfirmationModal';
-import { ProposalTXForm } from './ProposalTXForm';
+import { ProposalTXForm } from './ProposalTxForm/ProposalTXForm';
 import { HelperCard } from 'components/common/HelperCard';
 import { AsyncButton } from 'components/AsyncButton';
 
@@ -98,20 +107,18 @@ export const ProposalCreateInner: React.FC = () => {
         //   grid-template-columns: 400px 1fr;
         // `}
       >
-        <div>
-          <Card>
-            <Box display="grid" gap="4" paddingX="7" paddingY="6">
-              {/* <HelperCard variant="muted"> */}
-              <Box>
-                <Box as="p" color="white" marginBottom="2">
-                  You are creating a proposal draft.
-                </Box>
-                <Text as="p">
-                  If activated by a a DAO member with at least{' '}
-                  <strong>{minActivationThreshold?.formatUnits()}</strong>, the
-                  members of the DAO may vote to execute or reject the proposal.
-                </Text>
+        <Stack space="12">
+          <Card level="2" padding="10">
+            {/* <HelperCard variant="muted"> */}
+            <Stack space="3">
+              <Box as="p" color="white" marginBottom="2">
+                You are creating a proposal draft.
               </Box>
+              <Text as="p">
+                If activated by a a DAO member with at least{' '}
+                <strong>{minActivationThreshold?.formatUnits()}</strong>, the
+                members of the DAO may vote to execute or reject the proposal.
+              </Text>
               {/* </HelperCard> */}
               {proposalCfg?.notice && (
                 <HelperCard variant="primary">
@@ -134,6 +141,10 @@ export const ProposalCreateInner: React.FC = () => {
                   </Box>
                 </HelperCard>
               )}
+            </Stack>
+          </Card>
+          <Card level="2">
+            <Box display="grid" gap="4" padding="10">
               {/* <label tw="flex flex-col gap-1" htmlFor="title">
                 <span tw="text-sm">Title (max 140 characters)</span> */}
               <Input
@@ -181,61 +192,61 @@ export const ProposalCreateInner: React.FC = () => {
               )}
             </Box>
           </Card>
-        </div>
-        <Box display="flex" flexDirection="column" gap="4">
-          <Card padding="6">
-            <Heading level="2">Proposal Action</Heading>
-            <Box display="grid" gap="4" paddingX="7" paddingY="6">
-              <ProposalTXForm
-                setError={setError}
-                txRaw={txRaw}
-                setTxRaw={setTxRaw}
-              />
+          <Box display="flex" flexDirection="column" gap="4">
+            <Card padding="10" level="2">
+              <Text size="extraLarge">Proposal Action</Text>
+              <Box display="grid" gap="4" marginTop="10">
+                <ProposalTXForm
+                  setError={setError}
+                  txRaw={txRaw}
+                  setTxRaw={setTxRaw}
+                />
+              </Box>
+            </Card>
+            <Box display="flex" gap="4">
+              {payerMut &&
+                currentPayerBalance !== undefined &&
+                currentPayerBalance < 0.5 && (
+                  <AsyncButton
+                    width="full"
+                    // tw="flex-1"
+                    size="medium"
+                    onClick={async ({ provider }) => {
+                      await signAndConfirmTX(
+                        provider.newTX([
+                          SystemProgram.transfer({
+                            fromPubkey: provider.walletKey,
+                            toPubkey: payerMut,
+                            lamports: LAMPORTS_PER_SOL
+                          })
+                        ])
+                      );
+                    }}
+                  >
+                    <Box display="flex" flexDirection="column">
+                      <span>Fund with 1 SOL</span>
+                      <Text as="span" size="small">
+                        (payer balance: {currentPayerBalance.toLocaleString()}{' '}
+                        SOL)
+                      </Text>
+                    </Box>
+                  </AsyncButton>
+                )}
+              <Button
+                // tw="flex-1"
+                // size="md"
+                type="button"
+                disabled={!(tx && title && description) || !!error}
+                variant="primary"
+                onClick={() => {
+                  setShowConfirm(true);
+                }}
+              >
+                {error ? error : 'Preview Proposal'}
+              </Button>
             </Box>
-          </Card>
-          <Box display="flex" gap="4">
-            {payerMut &&
-              currentPayerBalance !== undefined &&
-              currentPayerBalance < 0.5 && (
-                <AsyncButton
-                  width="full"
-                  // tw="flex-1"
-                  size="medium"
-                  onClick={async ({ provider }) => {
-                    await signAndConfirmTX(
-                      provider.newTX([
-                        SystemProgram.transfer({
-                          fromPubkey: provider.walletKey,
-                          toPubkey: payerMut,
-                          lamports: LAMPORTS_PER_SOL
-                        })
-                      ])
-                    );
-                  }}
-                >
-                  <Box display="flex" flexDirection="column">
-                    <span>Fund with 1 SOL</span>
-                    <Text as="span" size="small">
-                      (payer balance: {currentPayerBalance.toLocaleString()}{' '}
-                      SOL)
-                    </Text>
-                  </Box>
-                </AsyncButton>
-              )}
-            <Button
-              // tw="flex-1"
-              // size="md"
-              type="button"
-              disabled={!(tx && title && description) || !!error}
-              variant="primary"
-              onClick={() => {
-                setShowConfirm(true);
-              }}
-            >
-              {error ? error : 'Preview Proposal'}
-            </Button>
           </Box>
-        </Box>
+        </Stack>
       </Box>
     </>
   );
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx
similarity index 96%
rename from components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
rename to components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx
index 2e8dca95..f03ef15f 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalTXForm.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx
@@ -8,6 +8,7 @@ import { HelperCard } from 'components/common/HelperCard';
 import { Box, Field, Spinner, Text } from 'degen';
 // import { Select } from '../../../../../common/inputs/InputText';
 // import { LoadingPage } from '../../../../../common/LoadingPage';
+import * as styles from './ProposalTxForm.css';
 
 interface Props {
   txRaw: string;
@@ -38,6 +39,7 @@ export const ProposalTXForm: React.FC<Props> = ({
       <Field label={<Text as="span">Proposed Action</Text>}>
         <select
           value={actionType}
+          className={styles.actionTypeSelect}
           onChange={e => {
             setActionType(e.target.value as ActionType);
             setError(null);
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTxForm.css.ts b/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTxForm.css.ts
new file mode 100644
index 00000000..6e26b2cb
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTxForm.css.ts
@@ -0,0 +1,9 @@
+import { style } from '@vanilla-extract/css';
+import { vars } from 'degen';
+
+export const actionTypeSelect = style({
+  background: vars.colors.background,
+  padding: '15px',
+  borderRadius: vars.radii.extraLarge,
+  color: vars.colors.text
+});
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/index.tsx
index 07d83817..1f7039e8 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalBody/index.tsx
@@ -19,9 +19,9 @@ export const ProposalBody: React.FC<Props> = ({
       {issue && (
         <Box
           paddingBottom="8"
-          marginBottom="8"
           borderBottomWidth="px"
           color="text"
+          fontSize="base"
           // tw="border-b border-b-gray-700 pb-8 mb-8"
         >
           <ReactMarkdown linkTarget="_blank">{issue.body ?? ''}</ReactMarkdown>
diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx
index 58a434b4..cde328b8 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx
@@ -29,8 +29,8 @@ export const ProposalDetails: React.FC<Props> = ({
             <Box
               key={i}
               display="flex"
-              paddingX="7"
-              paddingY="5"
+              paddingX="5"
+              paddingY="3"
               borderBottomWidth="px"
               // tw="px-7 py-5 border-b border-warmGray-800 flex"
             >
@@ -41,7 +41,7 @@ export const ProposalDetails: React.FC<Props> = ({
             </Box>
           ))}
         </Box>
-        <Box padding="7">
+        <Box padding="4">
           {/* {proposalInfo &&
             !proposalInfo.status.executed &&
             proposalInfo.proposalData.instructions.length > 0 && (
@@ -49,7 +49,7 @@ export const ProposalDetails: React.FC<Props> = ({
                 instructions={proposalInfo.proposalData.instructions}
               />
             )} */}
-          <Box {...(!proposalInfo?.status.executed && { marginTop: '7' })}>
+          <Box {...!proposalInfo?.status.executed}>
             <ProposalBody description={description} issue={githubIssue} />
           </Box>
         </Box>
diff --git a/components/Proposals/ProposalIndexView/locked-voter/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
index 6bd776d2..8281d357 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
@@ -29,7 +29,7 @@ export const ProposalIndexView: React.FC = () => {
         <Text
           as="h1"
           size="extraLarge"
-          weight="bold"
+          weight="semiBold"
           color="white"
           // tw="text-2xl md:text-3xl font-bold text-white tracking-tighter"
         >
@@ -95,13 +95,13 @@ export const ProposalIndexView: React.FC = () => {
           gap="4"
           // tw="flex flex-col md:(flex-row items-start) gap-4"
         >
-          <Box display="flex" flex={1} flexDirection="column" gap="4">
+          <Box display="flex" width="1/2" flexDirection="column" gap="4">
             <ProposalDetails proposalInfo={proposalInfo} />
           </Box>
           <Box
             display="flex"
             flexDirection="column"
-            width={{ md: '1/3', sm: 'full' }}
+            width="1/2"
             gap="4"
             // tw="w-full md:w-[350px] flex flex-col gap-4"
           >
diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
index ad1e299c..272f387b 100644
--- a/components/Proposals/ProposalsList/ProposalCard.tsx
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -1,5 +1,5 @@
 import { ProposalState } from 'helpers/dao';
-import { Box, Text } from 'degen';
+import { Box, Card, Text } from 'degen';
 import Link from 'next/link';
 
 import { useGovernor } from 'hooks/tribeca/useGovernor';
@@ -20,71 +20,80 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
   const router = useRouter();
   const { state, executed } = proposalInfo.status;
   return (
-    <Link passHref href={`${router.pathname}/proposals/${proposalInfo.index}`}>
-      <Box
-        display="flex"
-        alignItems="center"
-        justifyContent="space-between"
-        paddingX="6"
-        paddingY="5"
+    <Card hover>
+      <Link
+        passHref
+        href={`${router.pathname}/proposals/${proposalInfo.index}`}
       >
         <Box
           display="flex"
           alignItems="center"
-          gap="5"
-          // width={{ md: '192', xs: '3/4' }}
-          // tw="flex items-center gap-5 w-3/4 md:w-[500px]"
+          justifyContent="space-between"
+          paddingX="6"
+          paddingY="5"
+          borderRadius="extraLarge"
+          cursor="pointer"
         >
-          {state === ProposalState.Active && (
-            <Box width="11" height="11" color="accent">
-              <PulsingDot />
-            </Box>
-          )}
-          <Box>
-            <Box display="flex" alignItems="center">
-              <Text color="white" lineHeight="1.375">
-                {proposalInfo.proposalMetaData?.title.slice(
-                  0,
-                  PROPOSAL_TITLE_MAX_LEN
-                )}
-              </Text>
-            </Box>
-            {proposalInfo.proposalData && state !== null && (
-              <Box
-                display="flex"
-                flexDirection={{ md: 'row', xs: 'column' }}
-                alignItems={{ md: 'center' }}
-                marginTop={{ md: '4', xs: '2' }}
-                gap="2"
-              >
-                <ProposalStateLabel state={state} executed={executed} />
+          <Box
+            display="flex"
+            alignItems="center"
+            gap="5"
+            // width={{ md: '192', xs: '3/4' }}
+            // tw="flex items-center gap-5 w-3/4 md:w-[500px]"
+          >
+            {state === ProposalState.Active && (
+              <Box width="11" height="11" color="accent">
+                <PulsingDot />
+              </Box>
+            )}
+            <Box>
+              <Box display="flex" alignItems="center">
+                <Text color="white" lineHeight="1.375">
+                  {proposalInfo.proposalMetaData?.title.slice(
+                    0,
+                    PROPOSAL_TITLE_MAX_LEN
+                  )}
+                </Text>
+              </Box>
+              {proposalInfo.proposalData && state !== null && (
                 <Box
                   display="flex"
-                  gap="1"
-                  fontSize="small"
-                  fontWeight="semiBold"
+                  flexDirection={{ md: 'row', xs: 'column' }}
+                  alignItems={{ md: 'center' }}
+                  marginTop={{ md: '4', xs: '2' }}
+                  gap="2"
                 >
-                  <Text as="span">{`000${proposalInfo.index}`.slice(-4)}</Text>
-                  <Text as="span">&middot;</Text>
-                  <ProposalStateDate proposalInfo={proposalInfo} />
+                  <ProposalStateLabel state={state} executed={executed} />
+                  <Box
+                    display="flex"
+                    gap="1"
+                    fontSize="small"
+                    fontWeight="semiBold"
+                  >
+                    <Text as="span">
+                      {`000${proposalInfo.index}`.slice(-4)}
+                    </Text>
+                    <Text as="span">&middot;</Text>
+                    <ProposalStateDate proposalInfo={proposalInfo} />
+                  </Box>
                 </Box>
-              </Box>
-            )}
-          </Box>
-        </Box>
-        {state === ProposalState.Active && (
-          <Box width="1/2">
-            <ActiveProposalVotingBars proposal={proposalInfo} />
+              )}
+            </Box>
           </Box>
-        )}
-        {state !== null &&
-          state !== ProposalState.Draft &&
-          state !== ProposalState.Active && (
-            <Box width={{ sm: '16', md: '20', lg: '40' }}>
-              <ProposalStateBadge status={proposalInfo.status} />
+          {state === ProposalState.Active && (
+            <Box width="1/2">
+              <ActiveProposalVotingBars proposal={proposalInfo} />
             </Box>
           )}
-      </Box>
-    </Link>
+          {state !== null &&
+            state !== ProposalState.Draft &&
+            state !== ProposalState.Active && (
+              <Box width={{ sm: '16', md: '20', lg: '40' }}>
+                <ProposalStateBadge status={proposalInfo.status} />
+              </Box>
+            )}
+        </Box>
+      </Link>
+    </Card>
   );
 };
diff --git a/components/Proposals/ProposalsList/index.tsx b/components/Proposals/ProposalsList/index.tsx
index eb21b955..0b435e9e 100644
--- a/components/Proposals/ProposalsList/index.tsx
+++ b/components/Proposals/ProposalsList/index.tsx
@@ -112,7 +112,7 @@ export const ProposalsList: React.FC<Props> = ({
 
   const pageCount = calcPageTotal(allProposals.length ?? 0);
   return (
-    <Box>
+    <Box display="flex" flexDirection="column" gap="5">
       {allProposals
         .slice(startCursor, startCursor + PROPOSALS_PER_PAGE)
         .map((proposal, i) =>
diff --git a/components/common/governance/Card.tsx b/components/common/governance/Card.tsx
index 899e8eb9..cdd2f725 100644
--- a/components/common/governance/Card.tsx
+++ b/components/common/governance/Card.tsx
@@ -1,4 +1,4 @@
-import { Box, Button, Text } from 'degen';
+import { Box, Button, Stack, Text } from 'degen';
 import Link from 'next/link';
 
 import { HelperCard } from '../HelperCard';
@@ -30,28 +30,52 @@ export const Card: React.FC<Props> = ({
 }: Props) => {
   return (
     <Box
-      borderRadius="medium"
-      backgroundColor="black"
+      borderRadius="extraLarge"
+      backgroundColor="background"
       boxShadow="0.5"
+      padding="5"
       display="flex"
       flexDirection="column"
       className={className}
     >
-      {title && (
-        <Box
-          width="full"
-          height="16"
-          display="flex"
-          alignItems="center"
-          paddingX="7"
-          fontWeight="bold"
-          color="white"
-          // tw="h-16 flex items-center px-7 w-full text-white font-bold tracking-tight border-b border-warmGray-800"
-          // style={titleStyles}
-        >
-          {typeof title === 'string' ? <Text as="h2">{title}</Text> : title}
-        </Box>
-      )}
+      <Stack direction="horizontal">
+        {title && (
+          <Box
+            width="full"
+            display="flex"
+            alignItems="center"
+            fontWeight="bold"
+            color="white"
+            // tw="h-16 flex items-center px-7 w-full text-white font-bold tracking-tight border-b border-warmGray-800"
+            // style={titleStyles}
+          >
+            {typeof title === 'string' ? <Text as="h2">{title}</Text> : title}
+          </Box>
+        )}
+        {link && (
+          <Box>
+            {link.href ? (
+              <Link href={link.href} passHref>
+                <Button size="small" variant="transparent" center>
+                  {link.title}
+                </Button>
+              </Link>
+            ) : (
+              <Box
+                display="flex"
+                alignItems="center"
+                justifyContent="center"
+                paddingY="5"
+                fontSize="small"
+                fontWeight="bold"
+                color="white"
+              >
+                {link.title}
+              </Box>
+            )}
+          </Box>
+        )}
+      </Stack>
       {/* <ErrorBoundary
         fallback={
           <div tw="py-7 px-4">
@@ -62,49 +86,12 @@ export const Card: React.FC<Props> = ({
         }
       > */}
       <Box
+        paddingTop="5"
         {...(padded && { paddingX: '7', paddingY: '4' })}
         {...(bodyScrollX && { overflow: 'auto' })}
-        // css={[padded && tw`px-7 py-4`, bodyScrollX && tw`overflow-x-auto`]}
       >
         {children}
       </Box>
-      {/* </ErrorBoundary> */}
-      {link && (
-        <Box width="full">
-          {link.href ? (
-            <Link href={link.href} passHref>
-              <Button variant="transparent" center width="full">
-                {/* <Box
-                display="flex"
-                alignItems="center"
-                justifyContent="center"
-                paddingY="5"
-                fontSize="small"
-                fontWeight="bold"
-                textTransform="uppercase"
-                color="white"
-                // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800"
-              > */}
-                {link.title}
-                {/* </Box> */}
-              </Button>
-            </Link>
-          ) : (
-            <Box
-              display="flex"
-              alignItems="center"
-              justifyContent="center"
-              paddingY="5"
-              fontSize="small"
-              fontWeight="bold"
-              color="white"
-              // tw="flex items-center justify-center py-5 text-xs uppercase font-bold tracking-widest border-t border-warmGray-800 text-warmGray-600 cursor-not-allowed"
-            >
-              {link.title}
-            </Box>
-          )}
-        </Box>
-      )}
     </Box>
   );
 };
diff --git a/components/common/governance/GovernancePageInner.tsx b/components/common/governance/GovernancePageInner.tsx
index d047d1da..41cffa85 100644
--- a/components/common/governance/GovernancePageInner.tsx
+++ b/components/common/governance/GovernancePageInner.tsx
@@ -33,15 +33,9 @@ export const GovernancePageInner: React.FC<Props> = ({
   // const { daoName, iconURL } = useGovernor();
   return (
     <Box width="full">
-      <Box paddingBottom="24">
-        <Box
-          height="6"
-          width="3/4"
-          maxWidth="screenLg"
-          marginBottom="4"
-          // tw="h-6 mx-auto w-11/12 max-w-7xl mb-4"
-        >
-          {!hideDAOName && (
+      <Box>
+        {!hideDAOName && (
+          <Box width="3/4" maxWidth="screenLg" marginBottom="4">
             <Box
               display="flex"
               alignItems="center"
@@ -57,8 +51,8 @@ export const GovernancePageInner: React.FC<Props> = ({
               />
               <span>{daoName} Governance</span> */}
             </Box>
-          )}
-        </Box>
+          </Box>
+        )}
         <Box style={containerStyles}>
           <Box
             width="full"
@@ -117,13 +111,7 @@ export const GovernancePageInner: React.FC<Props> = ({
         </Box>
       </Box>
       <Box style={containerStyles}>
-        <Box
-          as="main"
-          width="full"
-          marginTop="-4"
-          marginBottom="20"
-          style={contentStyles}
-        >
+        <Box as="main" width="full" marginBottom="20" style={contentStyles}>
           {children}
         </Box>
       </Box>
diff --git a/pages/governance/proposals/[proposalIndex]/index.tsx b/pages/governance/proposals/[proposalIndex]/index.tsx
index 9fb5837a..a64de448 100644
--- a/pages/governance/proposals/[proposalIndex]/index.tsx
+++ b/pages/governance/proposals/[proposalIndex]/index.tsx
@@ -1,11 +1,25 @@
 import { NextPage } from 'next';
 import Layout from 'components/Layout/Layout';
 import { ProposalIndexView } from 'components/Proposals/ProposalIndexView';
+import { Button, IconChevronLeft, Stack } from 'degen';
+import { useRouter } from 'next/router';
 
 const Proposals: NextPage = () => {
+  const router = useRouter();
   return (
     <Layout>
-      <ProposalIndexView />
+      <Stack space="5">
+        <Button
+          onClick={router.back}
+          size="small"
+          variant="transparent"
+          rel="noreferrer"
+          prefix={<IconChevronLeft />}
+        >
+          Back
+        </Button>
+        <ProposalIndexView />
+      </Stack>
     </Layout>
   );
 };
diff --git a/pages/governance/proposals/create.tsx b/pages/governance/proposals/create.tsx
index e2a18afd..c3b3ae15 100644
--- a/pages/governance/proposals/create.tsx
+++ b/pages/governance/proposals/create.tsx
@@ -1,11 +1,27 @@
 import { NextPage } from 'next';
 import Layout from 'components/Layout/Layout';
 import { ProposalCreateView } from 'components/Proposals/ProposalCreateView/locked-voter';
+import { Box, Button, IconChevronLeft, Stack } from 'degen';
+import { useRouter } from 'next/router';
 
 const ProposalCreate: NextPage = () => {
+  const router = useRouter();
   return (
     <Layout>
-      <ProposalCreateView />
+      <Box padding="10">
+        <Stack space="5">
+          <Button
+            onClick={router.back}
+            size="small"
+            variant="transparent"
+            rel="noreferrer"
+            prefix={<IconChevronLeft />}
+          >
+            Back
+          </Button>
+          <ProposalCreateView />
+        </Stack>
+      </Box>
     </Layout>
   );
 };
diff --git a/pages/governance/proposals/index.tsx b/pages/governance/proposals/index.tsx
index 7e1f03cc..b790aa32 100644
--- a/pages/governance/proposals/index.tsx
+++ b/pages/governance/proposals/index.tsx
@@ -11,7 +11,12 @@ const Proposals: NextPage = () => {
 
   return (
     <Layout>
-      <Stack align="center" direction="horizontal" justify="space-between">
+      <Stack
+        align="center"
+        direction="horizontal"
+        space="20"
+        justify="space-between"
+      >
         <Stack align="center" direction="horizontal">
           <Text variant="large">All proposals</Text>
           <Link href="/governance/proposals/create" passHref>

From 9ba9fdbcfbd5d3610f148012375fca979ab4db33 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Tue, 31 May 2022 12:27:48 +0100
Subject: [PATCH 055/101] fix grid style

---
 .../ProposalIndexView/locked-voter/index.tsx  | 84 ++++++++-----------
 components/common/governance/Card.tsx         |  1 +
 2 files changed, 34 insertions(+), 51 deletions(-)

diff --git a/components/Proposals/ProposalIndexView/locked-voter/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
index 8281d357..33fafbe6 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
@@ -26,26 +26,13 @@ export const ProposalIndexView: React.FC = () => {
   return (
     <GovernancePage
       title={
-        <Text
-          as="h1"
-          size="extraLarge"
-          weight="semiBold"
-          color="white"
-          // tw="text-2xl md:text-3xl font-bold text-white tracking-tighter"
-        >
-          <Box
-            // minHeight="36px"
-            display="flex"
-            alignItems="center"
-            // tw="min-h-[36px] flex items-center break-words hyphens[auto]"
-          >
-            {proposalInfo ? (
-              proposalInfo?.proposalMetaData?.title ?? 'Proposal'
-            ) : (
-              <div></div>
-              // <ContentLoader tw="w-40 h-7" />
-            )}
-          </Box>
+        <Text size="extraLarge" weight="semiBold" color="white">
+          {proposalInfo ? (
+            proposalInfo?.proposalMetaData?.title ?? 'Proposal'
+          ) : (
+            <div></div>
+            // <ContentLoader tw="w-40 h-7" />
+          )}
         </Text>
       }
       header={
@@ -70,41 +57,36 @@ export const ProposalIndexView: React.FC = () => {
       }
     >
       {/* {proposalInfo && <ProposalHelmet proposalInfo={proposalInfo} />} */}
-      <Box display="grid" gap="4" marginBottom="20">
-        <Stack
-          direction="horizontal"
-          // tw="grid md:grid-cols-2 gap-4"
-        >
-          <Box flex={1}>
-            <VotesCard
-              side={VoteSide.For}
-              proposal={proposalInfo ? proposalInfo.proposalData : null}
-            />
-          </Box>
-          <Box flex={1}>
-            <VotesCard
-              side={VoteSide.Against}
-              proposal={proposalInfo ? proposalInfo.proposalData : null}
-            />
-          </Box>
-        </Stack>
+      <Box
+        display="grid"
+        style={{ gridTemplateColumns: '1fr 1fr' }}
+        gap="4"
+        marginBottom="20"
+      >
+        <Box flex={1}>
+          <VotesCard
+            side={VoteSide.For}
+            proposal={proposalInfo ? proposalInfo.proposalData : null}
+          />
+        </Box>
+        <Box flex={1}>
+          <VotesCard
+            side={VoteSide.Against}
+            proposal={proposalInfo ? proposalInfo.proposalData : null}
+          />
+        </Box>
+        <Box display="flex" flexDirection="column" gap="4">
+          <ProposalDetails proposalInfo={proposalInfo} />
+        </Box>
         <Box
+          height="full"
+          alignItems="stretch"
           display="flex"
-          flexDirection={{ sm: 'column', md: 'row' }}
-          alignItems={{ md: 'flex-start' }}
           gap="4"
-          // tw="flex flex-col md:(flex-row items-start) gap-4"
+          width="full"
+          // tw="w-full md:w-[350px] flex flex-col gap-4"
         >
-          <Box display="flex" width="1/2" flexDirection="column" gap="4">
-            <ProposalDetails proposalInfo={proposalInfo} />
-          </Box>
-          <Box
-            display="flex"
-            flexDirection="column"
-            width="1/2"
-            gap="4"
-            // tw="w-full md:w-[350px] flex flex-col gap-4"
-          >
+          <Box width="full" alignSelf="stretch" display="flex">
             {proposalInfo?.status.state === ProposalState.Draft && (
               <ProposalActivate proposal={proposalInfo} onActivate={noop} />
             )}
diff --git a/components/common/governance/Card.tsx b/components/common/governance/Card.tsx
index cdd2f725..09f5d057 100644
--- a/components/common/governance/Card.tsx
+++ b/components/common/governance/Card.tsx
@@ -35,6 +35,7 @@ export const Card: React.FC<Props> = ({
       boxShadow="0.5"
       padding="5"
       display="flex"
+      width="full"
       flexDirection="column"
       className={className}
     >

From 63242c037953b08757b598b112ffa037387f03b1 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Tue, 31 May 2022 12:28:13 +0100
Subject: [PATCH 056/101] add back btn and edited header

---
 pages/governance/proposals/index.tsx | 63 ++++++++++++++++++----------
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/pages/governance/proposals/index.tsx b/pages/governance/proposals/index.tsx
index b790aa32..d848362b 100644
--- a/pages/governance/proposals/index.tsx
+++ b/pages/governance/proposals/index.tsx
@@ -2,38 +2,55 @@ import { NextPage } from 'next';
 import { useState } from 'react';
 import { ProposalsList } from 'components/Proposals/ProposalsList';
 import Layout from 'components/Layout/Layout';
-import { Button, IconPlus, Stack, Text } from 'degen';
+import { Box, Button, IconChevronLeft, IconPlus, Stack, Text } from 'degen';
 import SmallToggleSwitch from 'components/SmallToggleSwitch/SmallToggleSwitch';
 import Link from 'next/link';
+import { useRouter } from 'next/router';
 
 const Proposals: NextPage = () => {
   const [showDrafts, setShowDrafts] = useState(true);
+  const router = useRouter();
 
   return (
     <Layout>
-      <Stack
-        align="center"
-        direction="horizontal"
-        space="20"
-        justify="space-between"
-      >
-        <Stack align="center" direction="horizontal">
-          <Text variant="large">All proposals</Text>
-          <Link href="/governance/proposals/create" passHref>
-            <Button size="small" shape="circle">
-              <IconPlus />
-            </Button>
-          </Link>
+      <Box padding="5">
+        <Stack space="8">
+          <Button
+            onClick={router.back}
+            size="small"
+            variant="transparent"
+            rel="noreferrer"
+            prefix={<IconChevronLeft />}
+          >
+            Back
+          </Button>
+          <Stack
+            align="center"
+            direction="horizontal"
+            space="20"
+            justify="space-between"
+          >
+            <Stack space="2" direction="vertical">
+              <Text variant="large" weight="semiBold">
+                All proposals
+              </Text>
+              <Stack align="center" direction="horizontal">
+                <SmallToggleSwitch
+                  isActive={showDrafts}
+                  setIsActive={setShowDrafts}
+                />
+                <Text variant="label">View Drafts</Text>
+              </Stack>
+            </Stack>
+            <Link href="/governance/proposals/create" passHref>
+              <Button variant="secondary" prefix={<IconPlus />} size="small">
+                New proposal
+              </Button>
+            </Link>
+          </Stack>
+          <ProposalsList showDrafts={showDrafts} />
         </Stack>
-        <Stack align="center" direction="horizontal">
-          <SmallToggleSwitch
-            isActive={showDrafts}
-            setIsActive={setShowDrafts}
-          />
-          <Text variant="label">View Drafts</Text>
-        </Stack>
-      </Stack>
-      <ProposalsList showDrafts={showDrafts} />
+      </Box>
     </Layout>
   );
 };

From bbbace4142b5620382ef0fed56065b51ff7f139a Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Tue, 31 May 2022 13:45:30 +0100
Subject: [PATCH 057/101] fix link bug and reduce vote stat width

---
 components/Proposals/ProposalsList/ProposalCard.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
index 272f387b..937eb85d 100644
--- a/components/Proposals/ProposalsList/ProposalCard.tsx
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -21,10 +21,7 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
   const { state, executed } = proposalInfo.status;
   return (
     <Card hover>
-      <Link
-        passHref
-        href={`${router.pathname}/proposals/${proposalInfo.index}`}
-      >
+      <Link passHref href={`/governance/proposals/${proposalInfo.index}`}>
         <Box
           display="flex"
           alignItems="center"
@@ -81,7 +78,7 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
             </Box>
           </Box>
           {state === ProposalState.Active && (
-            <Box width="1/2">
+            <Box width="1/3">
               <ActiveProposalVotingBars proposal={proposalInfo} />
             </Box>
           )}

From 8488de373a35434ee7e896d66311323d88d66035 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Tue, 31 May 2022 13:45:51 +0100
Subject: [PATCH 058/101] remove green border

---
 components/common/HelperCard.tsx | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/components/common/HelperCard.tsx b/components/common/HelperCard.tsx
index ce39dff7..8b8b65ec 100644
--- a/components/common/HelperCard.tsx
+++ b/components/common/HelperCard.tsx
@@ -21,16 +21,11 @@ export const HelperCard: React.FC<Props> = ({
   return (
     <Box
       paddingX="4"
-      paddingY="2"
-      borderWidth="1"
+      paddingY="4"
+      borderWidth="0.5"
       fontSize="small"
-      // backgroundColor="accent"
-      borderRadius="medium"
-      borderColor="green"
-      borderTopWidth="px"
-      borderLeftWidth="px"
-      borderRightWidth="px"
-      borderBottomWidth="px"
+      backgroundColor="black"
+      borderRadius="extraLarge"
       opacity="50"
       className={className}
     >

From d68135f16aabaae48a72b3c174436340ea225eb4 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Tue, 31 May 2022 13:50:31 +0100
Subject: [PATCH 059/101] no error when input empty

---
 .../locked-voter/ProposalCreateInner.tsx                  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
index 7aba6046..247420f6 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -181,9 +181,11 @@ export const ProposalCreateInner: React.FC = () => {
                   value={discussionLink}
                   onChange={e => setDiscussionLink(e.target.value)}
                   error={
-                    !discussionLink.startsWith(
-                      proposalCfg.discussion.prefix ?? ''
-                    )
+                    !discussionLink.length
+                      ? undefined
+                      : !discussionLink.startsWith(
+                          proposalCfg.discussion.prefix ?? ''
+                        )
                       ? 'Invalid discussion link'
                       : undefined
                   }

From 0b24a8766e29661656cbc7aa1bd5c169beab338e Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Tue, 31 May 2022 13:51:03 +0100
Subject: [PATCH 060/101] more layout fixes

---
 .../ProposalIndexView/locked-voter/index.tsx  | 43 +++++++------------
 components/common/governance/Card.tsx         |  4 +-
 pages/governance/proposals/index.tsx          |  4 +-
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/components/Proposals/ProposalIndexView/locked-voter/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
index 33fafbe6..2cae8ee9 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
@@ -75,33 +75,22 @@ export const ProposalIndexView: React.FC = () => {
             proposal={proposalInfo ? proposalInfo.proposalData : null}
           />
         </Box>
-        <Box display="flex" flexDirection="column" gap="4">
-          <ProposalDetails proposalInfo={proposalInfo} />
-        </Box>
-        <Box
-          height="full"
-          alignItems="stretch"
-          display="flex"
-          gap="4"
-          width="full"
-          // tw="w-full md:w-[350px] flex flex-col gap-4"
-        >
-          <Box width="full" alignSelf="stretch" display="flex">
-            {proposalInfo?.status.state === ProposalState.Draft && (
-              <ProposalActivate proposal={proposalInfo} onActivate={noop} />
-            )}
-            {proposalInfo?.status.state === ProposalState.Active && (
-              <ProposalVote proposalInfo={proposalInfo} onVote={noop} />
-            )}
-            {proposalInfo?.status.state === ProposalState.Succeeded && (
-              <ProposalQueue proposal={proposalInfo} onActivate={noop} />
-            )}
-            {proposalInfo?.status.state === ProposalState.Queued && (
-              <ProposalExecute proposal={proposalInfo} onActivate={noop} />
-            )}
-            <ProposalHistory proposalInfo={proposalInfo} />
-          </Box>
-        </Box>
+
+        <ProposalDetails proposalInfo={proposalInfo} />
+
+        {proposalInfo?.status.state === ProposalState.Draft && (
+          <ProposalActivate proposal={proposalInfo} onActivate={noop} />
+        )}
+        {proposalInfo?.status.state === ProposalState.Active && (
+          <ProposalVote proposalInfo={proposalInfo} onVote={noop} />
+        )}
+        {proposalInfo?.status.state === ProposalState.Succeeded && (
+          <ProposalQueue proposal={proposalInfo} onActivate={noop} />
+        )}
+        {proposalInfo?.status.state === ProposalState.Queued && (
+          <ProposalExecute proposal={proposalInfo} onActivate={noop} />
+        )}
+        <ProposalHistory proposalInfo={proposalInfo} />
       </Box>
     </GovernancePage>
   );
diff --git a/components/common/governance/Card.tsx b/components/common/governance/Card.tsx
index 09f5d057..783e6edb 100644
--- a/components/common/governance/Card.tsx
+++ b/components/common/governance/Card.tsx
@@ -30,9 +30,9 @@ export const Card: React.FC<Props> = ({
 }: Props) => {
   return (
     <Box
-      borderRadius="extraLarge"
+      borderRadius="3xLarge"
       backgroundColor="background"
-      boxShadow="0.5"
+      // boxShadow="0.5"
       padding="5"
       display="flex"
       width="full"
diff --git a/pages/governance/proposals/index.tsx b/pages/governance/proposals/index.tsx
index d848362b..fd41ea12 100644
--- a/pages/governance/proposals/index.tsx
+++ b/pages/governance/proposals/index.tsx
@@ -14,7 +14,7 @@ const Proposals: NextPage = () => {
   return (
     <Layout>
       <Box padding="5">
-        <Stack space="8">
+        <Stack space="5">
           <Button
             onClick={router.back}
             size="small"
@@ -30,7 +30,7 @@ const Proposals: NextPage = () => {
             space="20"
             justify="space-between"
           >
-            <Stack space="2" direction="vertical">
+            <Stack space="2" direction="horizontal">
               <Text variant="large" weight="semiBold">
                 All proposals
               </Text>

From f6c969b49b8307343dea2d08337c1b60ea7a612c Mon Sep 17 00:00:00 2001
From: BowTiedHeron <bowtiedheron@protonmail.com>
Date: Tue, 31 May 2022 17:23:05 +0200
Subject: [PATCH 061/101] styling example draft proposal

---
 .../locked-voter/ProposalCreateInner.tsx      | 32 ++++---------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
index 247420f6..11f3de49 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -112,35 +112,15 @@ export const ProposalCreateInner: React.FC = () => {
             {/* <HelperCard variant="muted"> */}
             <Stack space="3">
               <Box as="p" color="white" marginBottom="2">
-                You are creating a proposal draft.
+                Please take note of the following before creating a draft proposal:
               </Box>
               <Text as="p">
-                If activated by a a DAO member with at least{' '}
-                <strong>{minActivationThreshold?.formatUnits()}</strong>, the
-                members of the DAO may vote to execute or reject the proposal.
+                1) Please make sure to start a discussion on the forum to see if there is sufficient support for your proposal.<br />
+                <br />
+                2) Draft proposals can only be activated by a DAO member with at least 1,000,000 $honey, all members of the DAO may vote to execute or reject the proposal.<br />
+                <br />
+                3) For a proposal to be executed there should be a minimum of 50,000,000 $honey votes casted resulting in at least 2/3 of the votes for one option.
               </Text>
-              {/* </HelperCard> */}
-              {proposalCfg?.notice && (
-                <HelperCard variant="primary">
-                  <Box
-                    color="white"
-                    fontWeight="bold"
-                    // css={css`
-                    //   p {
-                    //     ${tw`mb-2`}
-                    //   }
-                    //   a {
-                    //     ${tw`text-white`}
-                    //     &:hover {
-                    //       ${tw`underline`}
-                    //     }
-                    //   }
-                    // `}
-                  >
-                    <ReactMarkdown>{proposalCfg.notice}</ReactMarkdown>
-                  </Box>
-                </HelperCard>
-              )}
             </Stack>
           </Card>
           <Card level="2">

From 554fac8a541fda40547362b5b9cca3933d7b668e Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Wed, 1 Jun 2022 02:48:35 +0100
Subject: [PATCH 062/101] fix header and add bg container for proposal cards

---
 pages/governance/proposals/index.tsx | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pages/governance/proposals/index.tsx b/pages/governance/proposals/index.tsx
index fd41ea12..a002e15e 100644
--- a/pages/governance/proposals/index.tsx
+++ b/pages/governance/proposals/index.tsx
@@ -30,17 +30,12 @@ const Proposals: NextPage = () => {
             space="20"
             justify="space-between"
           >
-            <Stack space="2" direction="horizontal">
-              <Text variant="large" weight="semiBold">
-                All proposals
-              </Text>
-              <Stack align="center" direction="horizontal">
-                <SmallToggleSwitch
-                  isActive={showDrafts}
-                  setIsActive={setShowDrafts}
-                />
-                <Text variant="label">View Drafts</Text>
-              </Stack>
+            <Stack align="center" direction="horizontal">
+              <Text variant="label">View Drafts</Text>
+              <SmallToggleSwitch
+                isActive={showDrafts}
+                setIsActive={setShowDrafts}
+              />
             </Stack>
             <Link href="/governance/proposals/create" passHref>
               <Button variant="secondary" prefix={<IconPlus />} size="small">
@@ -48,7 +43,9 @@ const Proposals: NextPage = () => {
               </Button>
             </Link>
           </Stack>
-          <ProposalsList showDrafts={showDrafts} />
+          <Box backgroundColor="background" borderRadius="2xLarge" padding="6">
+            <ProposalsList showDrafts={showDrafts} />
+          </Box>
         </Stack>
       </Box>
     </Layout>

From fc1e8730849cf07a0f470a1fa1e2167d8684dc5f Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Wed, 1 Jun 2022 02:50:04 +0100
Subject: [PATCH 063/101] remove unnecessary file

---
 .../ModalContainer/ModalContainer.css.tsx     | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 components/ModalContainer/ModalContainer.css.tsx

diff --git a/components/ModalContainer/ModalContainer.css.tsx b/components/ModalContainer/ModalContainer.css.tsx
deleted file mode 100644
index ff4b695e..00000000
--- a/components/ModalContainer/ModalContainer.css.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { style } from '@vanilla-extract/css';
-
-export const modalContainer = style({
-  display: 'flex',
-  position: 'fixed',
-  opacity: '0',
-  pointerEvents: 'none',
-  overflow: 'auto',
-  cursor: 'pointer',
-  padding: '5rem 0px 0px',
-  inset: '0',
-  zIndex: '99',
-  background:
-    'linear-gradient(to right, rgba(var(--background), 0.5), rgba(var(--background), 0.5)),linear-gradient( to right, rgba(var(--foreground), 0.1), rgba(var(--foreground), 0.1) )',
-  backdropFilter: 'blur(5px)',
-  transform: 'translateZ(0px)',
-  justifyContent: 'center',
-  alignItems: 'center',
-  transition: 'all .3s'
-});

From 2228eb33de944b696c7629354cbf1d8adebd7956 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Wed, 1 Jun 2022 02:51:18 +0100
Subject: [PATCH 064/101] edit proposal confirm modal

---
 .../ProposalConfirmationModal/ProposalIX.tsx  |  13 +-
 .../ProposalConfirmationModal/index.tsx       | 131 +++++++++---------
 2 files changed, 68 insertions(+), 76 deletions(-)

diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
index 86f3993e..b2ec8da8 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalIX.tsx
@@ -10,17 +10,8 @@ interface Props {
 export const ProposalIX: React.FC<Props> = ({ ix }: Props) => {
   const parsedIX = useParsedInstruction(ix);
   return (
-    <Box
-      opacity="50"
-      paddingX="4"
-      paddingY="2"
-      fontSize="small"
-      fontWeight="semiBold"
-      width="fit"
-    >
-      <Text as="span" color="orange">
-        {parsedIX.title}
-      </Text>
+    <Box opacity="50" fontSize="small" fontWeight="semiBold" width="fit">
+      <Text as="span">{parsedIX.title}</Text>
     </Box>
   );
 };
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
index 9ec552e0..4de16c1d 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
@@ -6,7 +6,7 @@ import { GovernorWrapper } from 'helpers/dao';
 import ReactMarkdown from 'react-markdown';
 import invariant from 'tiny-invariant';
 import { useRouter } from 'next/router';
-import { Box, IconLink, Text } from 'degen';
+import { Box, Button, IconLink, Text } from 'degen';
 
 import { useSDK } from 'helpers/sdk';
 import { useGovernor, useGovernorParams } from 'hooks/tribeca/useGovernor';
@@ -16,6 +16,7 @@ import type { ModalProps } from 'components/Modal';
 import { Modal } from 'components/Modal';
 import { ModalInner } from 'components/Modal/ModalInner';
 import { ProposalIX } from './ProposalIX';
+import ModalContainer from 'components/ModalContainer/ModalContainer';
 
 type Props = Omit<ModalProps, 'children'> & {
   proposal: {
@@ -64,75 +65,75 @@ export const ProposalConfirmModal: React.FC<Props> = ({
   };
 
   return (
-    <Modal
-      // tw="p-0 dark:text-white"
-      {...modalProps}
+    <ModalContainer
+      isVisible={modalProps.isOpen}
+      onClose={modalProps.onDismiss}
     >
-      <ModalInner
-        title={
-          <Text variant="large" ellipsis>
+      <Box width="128" display="grid" padding="10" gap="4">
+        <Box paddingBottom="3" borderBottomWidth="0.5">
+          <Text weight="semiBold" align="center" variant="large" ellipsis>
             Proposal: {proposal.title}
           </Text>
-        }
-        buttonProps={{
-          disabled: !tribecaMut,
-          variant: 'primary',
-          onClick: doProposeTransaction,
-          children: 'Propose Transaction'
-        }}
-      >
-        <Box display="grid" paddingY="4" gap="4">
-          <HelperCard>
-            <Box marginBottom="1">
-              <Text as="p">
-                Tip: The proposal cannot be modified after submission, so please
-                verify all information before submitting.
-              </Text>
-            </Box>
-            <Text as="p">
-              Once submitted, anyone with at least{' '}
-              {minActivationThreshold?.formatUnits()} may start the voting
-              period, i.e., activate the proposal. The voting period will then
-              immediately begin and last for {votingPeriodFmt}.
-            </Text>
-          </HelperCard>
-          <Box>
-            <Text>
-              <ReactMarkdown>{proposal.description}</ReactMarkdown>
+        </Box>
+        <HelperCard>
+          <Box marginBottom="3">
+            <Text size="small" lineHeight="1.5" as="p">
+              Tip: The proposal cannot be modified after submission, so please
+              verify all information before submitting.
             </Text>
           </Box>
-          <Box display="flex" flexDirection="column" gap="1.5">
-            {proposal.instructions.map((ix, i) => (
-              <ProposalIX key={i} ix={ix} />
-            ))}
-          </Box>
-          {network !== 'localnet' && proposal.instructions.length > 0 && (
-            <a
-              // tw="text-sm text-primary hover:text-white transition-colors flex items-center gap-2"
-              href={`https://${
-                network === 'mainnet-beta' ? '' : `${network}.`
-              }anchor.so/tx/inspector?message=${encodeURIComponent(
-                buildStubbedTransaction(network, proposal.instructions)
-                  .serializeMessage()
-                  .toString('base64')
-              )}`}
-              target="_blank"
-              rel="noreferrer"
-            >
-              <Box
-                display="flex"
-                alignItems="center"
-                gap="2"
-                color={{ base: 'green', hover: 'white' }}
-                fontSize="small"
-              >
-                <span>Preview on Anchor.so</span>
-                <IconLink size="5" />
-              </Box>
-            </a>
-          )}
+          <Text size="small" lineHeight="1.5" as="p">
+            Once submitted, anyone with at least{' '}
+            {minActivationThreshold?.formatUnits()} may start the voting period,
+            i.e., activate the proposal. The voting period will then immediately
+            begin and last for {votingPeriodFmt}.
+          </Text>
+        </HelperCard>
+        <Box>
+          <Text>
+            <ReactMarkdown>{proposal.description}</ReactMarkdown>
+          </Text>
+        </Box>
+        <Box display="flex" flexDirection="column" gap="1.5">
+          {proposal.instructions.map((ix, i) => (
+            <ProposalIX key={i} ix={ix} />
+          ))}
         </Box>
-      </ModalInner>
-    </Modal>
+        {network !== 'localnet' && proposal.instructions.length > 0 && (
+          <a
+            // tw="text-sm text-primary hover:text-white transition-colors flex items-center gap-2"
+            href={`https://${
+              network === 'mainnet-beta' ? '' : `${network}.`
+            }anchor.so/tx/inspector?message=${encodeURIComponent(
+              buildStubbedTransaction(network, proposal.instructions)
+                .serializeMessage()
+                .toString('base64')
+            )}`}
+            target="_blank"
+            rel="noreferrer"
+          >
+            <Box
+              display="flex"
+              alignItems="center"
+              gap="2"
+              color={{ base: 'green', hover: 'white' }}
+              fontSize="small"
+            >
+              <span>Preview on Anchor.so</span>
+              <IconLink size="5" />
+            </Box>
+          </a>
+        )}
+        <Button
+          disabled={!tribecaMut}
+          size="small"
+          width={'full'}
+          variant="primary"
+          onClick={doProposeTransaction}
+        >
+          Propose Transaction
+        </Button>
+      </Box>
+    </ModalContainer>
   );
 };

From 47751b909cf51b83426c6eec9dc4b568715426f5 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Wed, 1 Jun 2022 02:51:26 +0100
Subject: [PATCH 065/101] fix alignment

---
 components/Proposals/ProposalsList/ProposalCard.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/components/Proposals/ProposalsList/ProposalCard.tsx b/components/Proposals/ProposalsList/ProposalCard.tsx
index 937eb85d..1ceca4fc 100644
--- a/components/Proposals/ProposalsList/ProposalCard.tsx
+++ b/components/Proposals/ProposalsList/ProposalCard.tsx
@@ -85,9 +85,7 @@ export const ProposalCard: React.FC<Props> = ({ proposalInfo }: Props) => {
           {state !== null &&
             state !== ProposalState.Draft &&
             state !== ProposalState.Active && (
-              <Box width={{ sm: '16', md: '20', lg: '40' }}>
-                <ProposalStateBadge status={proposalInfo.status} />
-              </Box>
+              <ProposalStateBadge status={proposalInfo.status} />
             )}
         </Box>
       </Link>

From 77a0fb098281ec31cd2e84f7867a336fd82f25f9 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Wed, 1 Jun 2022 04:09:23 +0100
Subject: [PATCH 066/101] tooltip experiment

---
 components/ToolTip/ToolTip.css.ts | 17 ++++++++++++++++
 components/ToolTip/ToolTip.tsx    | 33 +++++++++++++++++++++++++++++++
 pages/governance/index.tsx        | 22 ++++++++++++---------
 3 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 components/ToolTip/ToolTip.css.ts
 create mode 100644 components/ToolTip/ToolTip.tsx

diff --git a/components/ToolTip/ToolTip.css.ts b/components/ToolTip/ToolTip.css.ts
new file mode 100644
index 00000000..63a13bea
--- /dev/null
+++ b/components/ToolTip/ToolTip.css.ts
@@ -0,0 +1,17 @@
+import { style } from '@vanilla-extract/css';
+import { vars } from 'degen';
+
+export const infoContainer = style({
+  marginLeft: vars.space[2],
+  transitionDuration: '300',
+  position: 'absolute',
+  left: '100%',
+  top: '50%',
+  width: '400px',
+  transform: 'translateY(-50%)',
+  backgroundColor: 'black',
+  padding: '10px',
+  fontSize: '14px',
+  borderWidth: '2.5px',
+  borderRadius: vars.radii.extraLarge
+});
diff --git a/components/ToolTip/ToolTip.tsx b/components/ToolTip/ToolTip.tsx
new file mode 100644
index 00000000..1c490d97
--- /dev/null
+++ b/components/ToolTip/ToolTip.tsx
@@ -0,0 +1,33 @@
+import { Box, Text } from 'degen';
+import React, { useState } from 'react';
+import * as styles from './ToolTip.css';
+
+const ToolTip = () => {
+  const [isOpen, setIsOpen] = useState(false);
+  return (
+    <Box position="relative">
+      <Box
+        height="4"
+        width="4"
+        backgroundColor="accentSecondary"
+        display="flex"
+        justifyContent="center"
+        alignItems="center"
+        borderRadius="extraLarge"
+        style={{ fontSize: '12px' }}
+        onMouseEnter={() => setIsOpen(true)}
+        onMouseLeave={() => setIsOpen(false)}
+        cursor="pointer"
+      >
+        <Text>i</Text>
+      </Box>
+      <Box className={styles.infoContainer} opacity={isOpen ? '100' : '0'}>
+        <Text as="p" weight="medium">
+          This box contains info about what the cursor is hovering over
+        </Text>
+      </Box>
+    </Box>
+  );
+};
+
+export default ToolTip;
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 2ebf9165..aaf8811c 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -30,6 +30,7 @@ import { Card as ProposalContainer } from 'components/common/governance/Card';
 import { useTokenAmount, useTokenMint } from '@saberhq/sail';
 import { useGovernor } from 'hooks/tribeca/useGovernor';
 import { TokenAmount } from '@saberhq/token-utils';
+import ToolTip from 'components/ToolTip/ToolTip';
 
 const Governance: NextPage = () => {
   const wallet = useConnectedWallet();
@@ -338,15 +339,18 @@ const Governance: NextPage = () => {
         >
           <ProposalContainer
             title={
-              <Text
-                weight="semiBold"
-                variant="large"
-                ellipsis
-                lineHeight="none"
-                whiteSpace="pre-wrap"
-              >
-                Recent Proposals
-              </Text>
+              <Stack align="center" direction="horizontal">
+                <Text
+                  weight="semiBold"
+                  variant="large"
+                  ellipsis
+                  lineHeight="none"
+                  whiteSpace="pre-wrap"
+                >
+                  Recent Proposals
+                </Text>
+                <ToolTip />
+              </Stack>
             }
             link={{
               title: 'View All Proposals',

From e9c3fb8627802614fc26d37c8ae43715230ff7c6 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Wed, 1 Jun 2022 12:19:47 +0100
Subject: [PATCH 067/101] space btw votes and bars

---
 .../Proposals/ProposalsList/ActiveProposalVotingBars.tsx      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx b/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
index 841778f6..4b394d77 100644
--- a/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
+++ b/components/Proposals/ProposalsList/ActiveProposalVotingBars.tsx
@@ -36,7 +36,7 @@ export const ActiveProposalVotingBars: React.FC<Props> = ({
         color="white"
       >
         <Meter value={forVotes} max={maxVotes} barColor={'primary'} />
-        <Box display="flex" flexBasis="12">
+        <Box marginLeft="3" display="flex" flexBasis="12">
           {formatNumberSI(forVotes)}
         </Box>
       </Box>
@@ -49,7 +49,7 @@ export const ActiveProposalVotingBars: React.FC<Props> = ({
         color="white"
       >
         <Meter value={againstVotes} max={maxVotes} barColor={'red'} />
-        <Box display="flex" flexBasis="12">
+        <Box marginLeft="3" display="flex" flexBasis="12">
           {formatNumberSI(againstVotes)}
         </Box>
       </Box>

From 40d39b14ad1801c5aa8a257561099529ecffc9c5 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Wed, 1 Jun 2022 12:45:56 +0100
Subject: [PATCH 068/101] fix alignment

---
 pages/governance/index.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index aaf8811c..3158d467 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -164,11 +164,7 @@ const Governance: NextPage = () => {
             flexDirection={{ xs: 'column', md: 'row' }}
             justifyContent="space-between"
           >
-            <Box
-              display="flex"
-              flexDirection={{ xs: 'column', md: 'row' }}
-              alignItems="center"
-            >
+            <Stack align="center">
               <IconExclamation color="accent" />
               <Text variant="small" align="center">
                 Pre-IDO HONEY (pHONEY) can be converted to HONEY at a 1:1 ratio.{' '}
@@ -178,8 +174,6 @@ const Governance: NextPage = () => {
                 (and receive veHONEY). To participate in governance, you can
                 lock your HONEY for veHONEY.
               </Text>
-            </Box>
-            <Stack direction="horizontal" justify="center" align="center">
               <Button
                 as="a"
                 href="https://docs.honey.finance/tokenomics/vehoney"

From 9bbb20cbddeb9db82d1ec43242130e68bae89fc2 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Wed, 1 Jun 2022 12:46:18 +0100
Subject: [PATCH 069/101] prompt wallet connect on new proposal click

---
 pages/governance/proposals/index.tsx | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pages/governance/proposals/index.tsx b/pages/governance/proposals/index.tsx
index a002e15e..bf4edec5 100644
--- a/pages/governance/proposals/index.tsx
+++ b/pages/governance/proposals/index.tsx
@@ -6,10 +6,14 @@ import { Box, Button, IconChevronLeft, IconPlus, Stack, Text } from 'degen';
 import SmallToggleSwitch from 'components/SmallToggleSwitch/SmallToggleSwitch';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
+import { useConnectedWallet } from '@saberhq/use-solana';
+import { useWalletKit } from '@gokiprotocol/walletkit';
 
 const Proposals: NextPage = () => {
   const [showDrafts, setShowDrafts] = useState(true);
   const router = useRouter();
+  const wallet = useConnectedWallet();
+  const { connect } = useWalletKit();
 
   return (
     <Layout>
@@ -37,11 +41,22 @@ const Proposals: NextPage = () => {
                 setIsActive={setShowDrafts}
               />
             </Stack>
-            <Link href="/governance/proposals/create" passHref>
-              <Button variant="secondary" prefix={<IconPlus />} size="small">
+            {wallet?.connected ? (
+              <Link href="/governance/proposals/create" passHref>
+                <Button variant="secondary" prefix={<IconPlus />} size="small">
+                  New proposal
+                </Button>
+              </Link>
+            ) : (
+              <Button
+                onClick={connect}
+                variant="secondary"
+                prefix={<IconPlus />}
+                size="small"
+              >
                 New proposal
               </Button>
-            </Link>
+            )}
           </Stack>
           <Box backgroundColor="background" borderRadius="2xLarge" padding="6">
             <ProposalsList showDrafts={showDrafts} />

From a55beea89b50915bbfd4bef33d4de9fae9b5905c Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Wed, 1 Jun 2022 13:49:52 +0100
Subject: [PATCH 070/101] reduce modal width

---
 .../locked-voter/ProposalConfirmationModal/index.tsx            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
index 4de16c1d..3e1c3cb5 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
@@ -69,7 +69,7 @@ export const ProposalConfirmModal: React.FC<Props> = ({
       isVisible={modalProps.isOpen}
       onClose={modalProps.onDismiss}
     >
-      <Box width="128" display="grid" padding="10" gap="4">
+      <Box width="144" display="grid" padding="10" gap="4">
         <Box paddingBottom="3" borderBottomWidth="0.5">
           <Text weight="semiBold" align="center" variant="large" ellipsis>
             Proposal: {proposal.title}

From 11e3402889b072fbf3156e52fee423cc5b1b189b Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Wed, 1 Jun 2022 13:50:24 +0100
Subject: [PATCH 071/101] remove 1 from proposal details box

---
 .../Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx b/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx
index cde328b8..2abc044e 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/ProposalDetails.tsx
@@ -34,7 +34,6 @@ export const ProposalDetails: React.FC<Props> = ({
               borderBottomWidth="px"
               // tw="px-7 py-5 border-b border-warmGray-800 flex"
             >
-              <Text weight="medium">{i + 1}</Text>
               <Box flex={1} color="white">
                 {/* <IXSummary instruction={ix} /> */}
               </Box>

From c64125b65395b8adbc0364054d2f7d6780f25f0a Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Thu, 2 Jun 2022 08:14:43 -0500
Subject: [PATCH 072/101] add issue token action

---
 actions/minter/IssueTokensAction/index.tsx    | 249 ++++++++++++++++++
 actions/types.tsx                             |  21 +-
 .../ProposalTxForm/ProposalTXForm.tsx         |   4 +-
 helpers/dao/wrappers/lockedVoter/escrow.ts    |   2 +-
 helpers/makeTransaction.ts                    |  39 +++
 helpers/parser.ts                             |   8 +-
 helpers/sdk/constant.ts                       |   8 +-
 hooks/tribeca/useGovernor.ts                  |  26 +-
 hooks/useParseTokenAmount.ts                  |  22 ++
 package.json                                  |   1 +
 pages/_app.tsx                                |  10 +-
 yarn.lock                                     |  23 +-
 12 files changed, 368 insertions(+), 45 deletions(-)
 create mode 100644 actions/minter/IssueTokensAction/index.tsx
 create mode 100644 helpers/makeTransaction.ts
 create mode 100644 hooks/useParseTokenAmount.ts

diff --git a/actions/minter/IssueTokensAction/index.tsx b/actions/minter/IssueTokensAction/index.tsx
new file mode 100644
index 00000000..55b156c6
--- /dev/null
+++ b/actions/minter/IssueTokensAction/index.tsx
@@ -0,0 +1,249 @@
+import { findMinterAddress, QUARRY_CODERS } from '@quarryprotocol/quarry-sdk';
+import {
+  TOKEN_ACCOUNT_PARSER,
+  useParsedAccountData,
+  usePubkey,
+  useSail
+} from '@saberhq/sail';
+import { buildStubbedTransaction } from '@saberhq/solana-contrib';
+import {
+  getATAAddress,
+  getOrCreateATA,
+  SPLToken,
+  TOKEN_PROGRAM_ID
+} from '@saberhq/token-utils';
+import { useSolana } from '@saberhq/use-solana';
+import type { TransactionInstruction } from '@solana/web3.js';
+import { useEffect, useMemo, useState } from 'react';
+import { useQuery } from 'react-query';
+import invariant from 'tiny-invariant';
+
+import { AsyncButton } from 'components/common/AsyncButton';
+import { useGovernor } from 'hooks/tribeca/useGovernor';
+import { useParseTokenAmount } from 'hooks/useParseTokenAmount';
+import { serializeToBase64 } from 'helpers/makeTransaction';
+import { useParsedMintWrapper } from 'helpers/parser';
+import type { ActionFormProps } from '../../types';
+import { Input } from 'degen';
+
+export const IssueTokensAction: React.FC<ActionFormProps> = ({
+  actor,
+  ctx,
+  setError,
+  setTxRaw
+}: ActionFormProps) => {
+  const { govToken } = useGovernor();
+  const [amountStr, setAmountStr] = useState<string>('');
+  const [destinationStr, setDestinationStr] = useState<string>('');
+  const { network, providerMut } = useSolana();
+  const amount = useParseTokenAmount(govToken, amountStr);
+  const recipient = usePubkey(destinationStr);
+  const { handleTX } = useSail();
+
+  const minter = ctx?.minter;
+  const mintWrapper = useMemo(
+    () => (minter ? minter.mintWrapper : null),
+    [minter]
+  );
+  const { data: mintWrapperData } = useParsedMintWrapper(mintWrapper);
+  const { data: iouATAKey } = useQuery(
+    ['ata', mintWrapperData?.accountInfo.data.tokenMint, actor?.toString()],
+    async () => {
+      invariant(mintWrapperData && actor);
+      return await getATAAddress({
+        mint: mintWrapperData.accountInfo.data.tokenMint,
+        owner: actor
+      });
+    },
+    { enabled: !!mintWrapperData && !!actor }
+  );
+  const { data: iouATA } = useParsedAccountData(
+    iouATAKey,
+    TOKEN_ACCOUNT_PARSER
+  );
+
+  const outputToken = mintWrapperData?.accountInfo.data.tokenMint;
+  const { data: outputATAKey } = useQuery(
+    ['ata', outputToken?.toString(), actor?.toString()],
+    async () => {
+      invariant(outputToken && actor);
+      return await getATAAddress({
+        mint: outputToken,
+        owner: actor
+      });
+    },
+    { enabled: !!mintWrapperData && !!actor }
+  );
+  const { data: outputATA } = useParsedAccountData(
+    outputATAKey,
+    TOKEN_ACCOUNT_PARSER
+  );
+
+  const { data: recipientATAKey } = useQuery(
+    ['ata', outputToken?.toString(), recipient?.toString()],
+    async () => {
+      invariant(outputToken && recipient);
+      return await getATAAddress({
+        mint: outputToken,
+        owner: recipient
+      });
+    },
+    { enabled: !!outputToken && !!recipient }
+  );
+  const { data: recipientATA } = useParsedAccountData(
+    recipientATAKey,
+    TOKEN_ACCOUNT_PARSER
+  );
+
+  useEffect(() => {
+    if (
+      !providerMut ||
+      !mintWrapper ||
+      !actor ||
+      !amount ||
+      !recipient ||
+      !mintWrapperData ||
+      !govToken
+    ) {
+      return;
+    }
+    void (async () => {
+      const [minter] = await findMinterAddress(mintWrapper, actor);
+
+      const ixs: TransactionInstruction[] = [];
+
+      const destinationATA = await getATAAddress({
+        mint: mintWrapperData.accountInfo.data.tokenMint,
+        owner: recipient
+      });
+
+      const mintDestination = destinationATA;
+
+      const mintIX = QUARRY_CODERS.MintWrapper.encodeIX(
+        'performMint',
+        { amount: amount.toU64() },
+        {
+          mintWrapper,
+          minterAuthority: actor,
+          destination: mintDestination,
+          minter,
+          tokenMint: mintWrapperData.accountInfo.data.tokenMint,
+          tokenProgram: TOKEN_PROGRAM_ID
+        }
+      );
+      ixs.push(mintIX);
+
+      try {
+        const txStub = buildStubbedTransaction(
+          network !== 'localnet' ? network : 'devnet',
+          ixs
+        );
+        setTxRaw(serializeToBase64(txStub));
+        setError(null);
+      } catch (ex) {
+        setTxRaw('');
+        console.debug('Error issuing tokens', ex);
+        setError('Error generating proposal');
+      }
+    })();
+  }, [
+    amount,
+    recipient,
+    govToken,
+    mintWrapper,
+    mintWrapperData,
+    network,
+    providerMut,
+    setError,
+    setTxRaw,
+    actor
+  ]);
+
+  return (
+    <>
+      <Input
+        label="Amount"
+        type="number"
+        min={0}
+        value={amountStr || ''}
+        onChange={e => setAmountStr(e.target.value)}
+        disabled={!actor}
+      />
+      {/* <InputTokenAmount
+        label="Amount"
+        token={govToken ?? null}
+        tokens={[]}
+        tw="h-auto"
+        inputValue={amountStr}
+        inputDisabled={!actor}
+        inputOnChange={e => {
+          setAmountStr(e);
+        }}
+      /> */}
+      <Input
+        label="Recipient"
+        id="destination"
+        placeholder="Address to give tokens to"
+        onChange={e => setDestinationStr(e.target.value)}
+      />
+      {/* <label tw="flex flex-col gap-1" htmlFor="destination">
+        <span tw="text-sm">Recipient</span>
+        <InputText
+          id="destination"
+          placeholder="Address to give tokens to."
+          value={destinationStr}
+          onChange={e => {
+            setDestinationStr(e.target.value);
+          }}
+        />
+      </label> */}
+      {((iouATAKey && iouATA === null) ||
+        (outputATAKey && outputATA === null) ||
+        (recipientATAKey && recipientATA === null)) && (
+        <AsyncButton
+          disabled={!mintWrapperData || !actor || !outputToken}
+          onClick={async sdkMut => {
+            invariant(mintWrapperData && actor && outputToken);
+            const ixs: (TransactionInstruction | null)[] = [];
+            const { instruction: createMintWrapperATAIX } =
+              await getOrCreateATA({
+                provider: sdkMut.provider,
+                mint: mintWrapperData.accountInfo.data.tokenMint,
+                owner: actor
+              });
+            ixs.push(createMintWrapperATAIX);
+
+            if (
+              !outputToken.equals(mintWrapperData.accountInfo.data.tokenMint)
+            ) {
+              const { instruction: createRedeemATAIX } = await getOrCreateATA({
+                provider: sdkMut.provider,
+                mint: outputToken,
+                owner: actor
+              });
+              ixs.push(createRedeemATAIX);
+            }
+            if (recipient) {
+              const { instruction: recipientATA } = await getOrCreateATA({
+                provider: sdkMut.provider,
+                mint: outputToken,
+                owner: recipient
+              });
+              ixs.push(recipientATA);
+            }
+            const { pending, success } = await handleTX(
+              sdkMut.provider.newTX(ixs),
+              'Create token accounts'
+            );
+            if (!success || !pending) {
+              return;
+            }
+            await pending.wait();
+          }}
+        >
+          Create token accounts
+        </AsyncButton>
+      )}
+    </>
+  );
+};
diff --git a/actions/types.tsx b/actions/types.tsx
index 461d13fe..a71ada72 100644
--- a/actions/types.tsx
+++ b/actions/types.tsx
@@ -1,7 +1,7 @@
 import type { PublicKey } from '@solana/web3.js';
-// import type { GovernorConfig } from '@tribecahq/registry';
 
 import { Memo } from './Memo';
+import { IssueTokensAction } from './minter/IssueTokensAction';
 import { RawTX } from './RawTX';
 
 export interface ActorContext {
@@ -16,7 +16,9 @@ export interface ActorContext {
   /**
    * Settings for minting tokens as the DAO. Enabling this allows DAO members to create "mint" proposals which can be used for grants.
    */
-  // minter?: GovernorConfig['minter'];
+  minter?: {
+    mintWrapper?: PublicKey;
+  };
 }
 
 export interface ActionFormProps {
@@ -38,8 +40,6 @@ export interface Action {
 export const ACTION_TYPES = [
   'Memo',
   'Issue Tokens',
-  'Upgrade Program',
-  'Whitelist Program-Managed Vote Escrow',
   'Raw Transaction (base64)'
 ] as const;
 
@@ -52,12 +52,13 @@ export const ACTIONS: Action[] = [
       "A memo allows a DAO to attest a message on chain. Memo actions may be used to create proposals that don't have any on-chain actions.",
     Renderer: Memo
   },
-  // {
-  //   title: "Issue Revocable Token Grant",
-  //   description: "Issue a revocable grant of tokens on behalf of the DAO.",
-  //   isEnabled: ({ minter }) => !!minter,
-  //   Renderer: VenkoGrantAction,
-  // },
+  {
+    title: 'Issue Tokens',
+    description:
+      'Issue tokens on behalf of the DAO. This can be used for grants, liquidity mining, and more.',
+    isEnabled: ({ minter }) => !!minter,
+    Renderer: IssueTokensAction
+  },
   {
     title: 'Raw Transaction (base64)',
     Renderer: RawTX
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx
index f03ef15f..fbc72375 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx
@@ -22,7 +22,7 @@ export const ProposalTXForm: React.FC<Props> = ({
   setTxRaw
 }: Props) => {
   const [actionType, setActionType] = useState<ActionType>('Memo');
-  const { smartWallet, lockerData, governor } = useGovernor();
+  const { smartWallet, lockerData, governor, minter } = useGovernor();
   const { ownerInvokerKey } = useExecutiveCouncil();
 
   if (!smartWallet || !ownerInvokerKey) {
@@ -30,7 +30,7 @@ export const ProposalTXForm: React.FC<Props> = ({
   }
 
   const actor = smartWallet;
-  const ctx = { locker: lockerData?.publicKey, governor };
+  const ctx = { locker: lockerData?.publicKey, governor, minter };
 
   const currentAction = ACTIONS.find(action => action.title === actionType);
 
diff --git a/helpers/dao/wrappers/lockedVoter/escrow.ts b/helpers/dao/wrappers/lockedVoter/escrow.ts
index 467d32da..8a08b052 100644
--- a/helpers/dao/wrappers/lockedVoter/escrow.ts
+++ b/helpers/dao/wrappers/lockedVoter/escrow.ts
@@ -77,7 +77,7 @@ export class VoteEscrow {
         return new BN(0);
       }
       const secondsUntilLockupExpiry = escrowData.escrowEndsAt
-        .sub(new BN(timestampSeconds))
+        .sub(escrowData.escrowStartedAt)
         .toNumber();
       const relevantSecondsUntilLockupExpiry = Math.min(
         secondsUntilLockupExpiry,
diff --git a/helpers/makeTransaction.ts b/helpers/makeTransaction.ts
new file mode 100644
index 00000000..98aa55d7
--- /dev/null
+++ b/helpers/makeTransaction.ts
@@ -0,0 +1,39 @@
+import type { Network } from '@saberhq/solana-contrib';
+import type { Cluster, TransactionInstruction } from '@solana/web3.js';
+import { PublicKey, Transaction } from '@solana/web3.js';
+
+export const serializeToBase64 = (tx: Transaction): string =>
+  tx
+    .serialize({
+      requireAllSignatures: false,
+      verifySignatures: false
+    })
+    .toString('base64');
+
+export const makeTransaction = (
+  network: Network,
+  ixs: TransactionInstruction[]
+): Transaction => {
+  const tx = new Transaction();
+  tx.recentBlockhash = 'GfVcyD4kkTrj4bKc7WA9sZCin9JDbdT4Zkd3EittNR1W';
+  tx.feePayer =
+    network === 'devnet'
+      ? new PublicKey('A2jaCHPzD6346348JoEym2KFGX9A7uRBw6AhCdX7gTWP')
+      : new PublicKey('9u9iZBWqGsp5hXBxkVZtBTuLSGNAG9gEQLgpuVw39ASg');
+  tx.instructions = ixs;
+  return tx;
+};
+
+/**
+ * Generates a link for inspecting the contents of a transaction.
+ *
+ * @returns URL
+ */
+export const generateInspectLink = (
+  cluster: Cluster,
+  tx: Transaction
+): string => {
+  return `https://anchor.so/tx/inspector?cluster=${cluster}&message=${encodeURIComponent(
+    serializeToBase64(tx)
+  )}`;
+};
diff --git a/helpers/parser.ts b/helpers/parser.ts
index 39bf8dc9..07c3185c 100644
--- a/helpers/parser.ts
+++ b/helpers/parser.ts
@@ -1,6 +1,7 @@
 import { GOKI_CODERS } from '@gokiprotocol/client';
 import { makeParserHooks, makeProgramParserHooks } from '@saberhq/sail';
 import { SNAPSHOTS_CODERS } from '@saberhq/snapshots';
+import { QUARRY_CODERS } from '@quarryprotocol/quarry-sdk';
 import { HONEY_DAO_CODERS } from './dao';
 
 // import { HONEY_DAO_CODERS } from './sdk';
@@ -8,7 +9,8 @@ import { HONEY_DAO_CODERS } from './dao';
 const parserHooks = makeParserHooks({
   ...HONEY_DAO_CODERS.Govern.accountParsers,
   ...HONEY_DAO_CODERS.LockedVoter.accountParsers,
-  ...GOKI_CODERS.SmartWallet.accountParsers
+  ...GOKI_CODERS.SmartWallet.accountParsers,
+  ...QUARRY_CODERS.MintWrapper.accountParsers
 });
 
 export const {
@@ -21,6 +23,10 @@ export const {
   escrowV2: { useData: useParsedEscrows, useSingleData: useParsedEscrow },
   governor: { useData: useParsedGovernors, useSingleData: useParsedGovernor },
   vote: { useData: useParsedVotes, useSingleData: useParsedVote },
+  mintWrapper: {
+    useData: useParsedMintWrappers,
+    useSingleData: useParsedMintWrapper
+  },
   transaction: { useData: useParsedTXByKeys, useSingleData: useParsedTXByKey }
 } = parserHooks;
 
diff --git a/helpers/sdk/constant.ts b/helpers/sdk/constant.ts
index 2fca2681..9f550974 100644
--- a/helpers/sdk/constant.ts
+++ b/helpers/sdk/constant.ts
@@ -3,7 +3,8 @@ import { PublicKey } from '@solana/web3.js';
 export const HONEY_WADS = 1000000;
 
 export const HONEY_MINT = new PublicKey(
-  'Bh7vMfPZkGsQJqUjBBGGfcAj6yQdkL8SoLtK5TCYeJtY'
+  process.env.NEXT_PUBLIC_HONEY_MINT ||
+    'Bh7vMfPZkGsQJqUjBBGGfcAj6yQdkL8SoLtK5TCYeJtY'
 );
 
 export const HONEY_DECIMALS = 6;
@@ -24,3 +25,8 @@ export const GOVERNOR_ADDRESS = new PublicKey(
   process.env.NEXT_PUBLIC_GOVERNOR_ADDRESS ||
     'CSFk5VQwpQVs5tVXRLi5jtqJVkySAPxBxAQPD4W2mePa'
 );
+
+export const HONEY_MINT_WRAPPER = new PublicKey(
+  process.env.NEXT_PUBLIC_HONEY_MINT_WRAPPER ||
+    '9vMQwBT67tMN21BRkRoJQqJ7EaZjK3afkHFjZxTzARE7'
+);
diff --git a/hooks/tribeca/useGovernor.ts b/hooks/tribeca/useGovernor.ts
index 2c93994f..695a8c15 100644
--- a/hooks/tribeca/useGovernor.ts
+++ b/hooks/tribeca/useGovernor.ts
@@ -9,28 +9,6 @@ import { useSDK } from 'helpers/sdk';
 import { formatDurationSeconds } from 'helpers/format';
 import { useGovernorData, useLockerData } from 'helpers/parser';
 
-// export interface GaugeSettings {
-//   gaugemeister: PublicKey;
-// }
-
-// export type GovernorInfo = (
-//   | {
-//       key: PublicKey;
-//       meta: GovernorConfig | null;
-//       slug: string;
-//       loading: boolean;
-//     }
-//   | {
-//       key: PublicKey | null;
-//       meta: GovernorConfig | null;
-//       slug: string;
-//       loading: true;
-//     }
-// ) & {
-//   gauge: GaugeSettings | null;
-//   manifest: GovernorConfig | null | undefined;
-// };
-
 // export const useGovernorInfo = (): GovernorInfo | null => {
 //   const { governor: governorStr } = useParams<{ governor: string }>();
 //   const { data: governorMetas, isLoading, isFetched } = useTribecaRegistry();
@@ -84,6 +62,9 @@ import { useGovernorData, useLockerData } from 'helpers/parser';
 interface GovernorProps {
   governor: PublicKey | undefined;
   govToken: PublicKey | undefined;
+  minter?: {
+    mintWrapper?: PublicKey;
+  };
 }
 
 const useGovernorInner = (props: GovernorProps | undefined) => {
@@ -162,6 +143,7 @@ const useGovernorInner = (props: GovernorProps | undefined) => {
   };
 
   return {
+    minter: props.minter,
     manifest,
     governor,
     governorW,
diff --git a/hooks/useParseTokenAmount.ts b/hooks/useParseTokenAmount.ts
new file mode 100644
index 00000000..148a7276
--- /dev/null
+++ b/hooks/useParseTokenAmount.ts
@@ -0,0 +1,22 @@
+import type { Token } from '@saberhq/token-utils';
+import { TokenAmount } from '@saberhq/token-utils';
+import { useMemo } from 'react';
+
+export const useParseTokenAmount = (
+  token: Token | null | undefined,
+  valueStr: string
+): TokenAmount | null | undefined => {
+  return useMemo(() => {
+    if (!valueStr) {
+      return null;
+    }
+    if (!token) {
+      return token;
+    }
+    try {
+      return TokenAmount.parse(token, valueStr);
+    } catch (e) {
+      return null;
+    }
+  }, [token, valueStr]);
+};
diff --git a/package.json b/package.json
index 4f3d13f0..1ad39999 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "@nfteyez/sol-rayz-react": "^0.10.2",
     "@octokit/plugin-rest-endpoint-methods": "^5.13.0",
     "@project-serum/anchor": "^0.24.2",
+    "@quarryprotocol/quarry-sdk": "^5.0.2",
     "@saberhq/anchor-contrib": "^1.12.69",
     "@saberhq/sail": "3.4.4",
     "@saberhq/snapshots": "^0.2.8",
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 26f2ac5d..d84850d6 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -11,7 +11,12 @@ import { ThemeProvider } from 'degen';
 import { ToastContainer } from 'react-toastify';
 import { accentSequence, ThemeAccent } from 'helpers/theme-utils';
 import SecPopup from 'components/SecPopup';
-import { GOVERNOR_ADDRESS, HONEY_MINT, SDKProvider } from 'helpers/sdk';
+import {
+  GOVERNOR_ADDRESS,
+  HONEY_MINT,
+  // HONEY_MINT_WRAPPER,
+  SDKProvider
+} from 'helpers/sdk';
 import { GovernorProvider } from 'hooks/tribeca/useGovernor';
 
 import 'degen/styles';
@@ -86,6 +91,9 @@ function MyApp({ Component, pageProps }: AppProps) {
                 initialState={{
                   governor: GOVERNOR_ADDRESS,
                   govToken: HONEY_MINT
+                  // minter: {
+                  //   mintWrapper: HONEY_MINT_WRAPPER
+                  // }
                 }}
               >
                 {/* {children} */}
diff --git a/yarn.lock b/yarn.lock
index 6757f19a..da497c48 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -745,6 +745,15 @@
     bs58 "^4.0.1"
     eventemitter3 "^4.0.7"
 
+"@quarryprotocol/quarry-sdk@^5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@quarryprotocol/quarry-sdk/-/quarry-sdk-5.0.2.tgz#f306ef4c0446a2ae7432e6e0593bc3dcb75812ee"
+  integrity sha512-wczlmNfb8fk6WCZsLLR7ysSjgxl6ZdEJ7cNDhgvFpU9E1YMSN1f2l2NK9yw+VksuLxWCightFsBrHSqqIftDzQ==
+  dependencies:
+    superstruct "^0.15.4"
+    tiny-invariant "^1.2.0"
+    tslib "^2.3.1"
+
 "@reach/dialog@^0.16.2":
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/@reach/dialog/-/dialog-0.16.2.tgz#567e6f59d0a6dabe84b2ba4c456404efa6cb7d03"
@@ -1145,7 +1154,7 @@
     localstorage-memory "^1.0.3"
     superstruct "0.14.2"
     tweetnacl "^1.0.3"
-    
+
 "@tribecahq/tribeca-sdk@^0.5.6":
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/@tribecahq/tribeca-sdk/-/tribeca-sdk-0.5.6.tgz#c0e5cdbb01250de305245bdb3802429c25ec58f8"
@@ -4397,7 +4406,7 @@ klaw-sync@^6.0.0:
   integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
   dependencies:
     graceful-fs "^4.1.11"
-    
+
 kleur@^4.0.3:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.4.tgz#8c202987d7e577766d039a8cd461934c01cda04d"
@@ -6885,11 +6894,6 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^2.0.1"
 
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-  
 unist-builder@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-3.0.0.tgz#728baca4767c0e784e1e64bb44b5a5a753021a04"
@@ -6955,6 +6959,11 @@ unist-util-visit@^4.0.0:
     unist-util-is "^5.0.0"
     unist-util-visit-parents "^5.0.0"
 
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 unload@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/unload/-/unload-2.2.0.tgz#ccc88fdcad345faa06a92039ec0f80b488880ef7"

From 704cc89fc26a994c6376004b1f57c6ae6f791ea2 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Thu, 2 Jun 2022 10:24:13 -0500
Subject: [PATCH 073/101] change env variable name

---
 .env.example             | 2 +-
 helpers/dao/constants.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index 8dbca527..73708fed 100644
--- a/.env.example
+++ b/.env.example
@@ -1,7 +1,7 @@
 NEXT_PUBLIC_RPC_NODE = 'https://api.mainnet-beta.solana.com'
 NEXT_PUBLIC_GA=
 NEXT_PUBLIC_STAKE_POOL_ADDR=
-NEXT_PUBLIC_VOTE_PROGRAM_ID=
+NEXT_PUBLIC_VOTER_PROGRAM_ID=
 NEXT_PUBLIC_GOVERNOR_ADDRESS=
 NEXT_PUBLIC_SMART_WALLET_ADDRESS=
 NEXT_PUBLIC_LOCKER_ADDR=
diff --git a/helpers/dao/constants.ts b/helpers/dao/constants.ts
index 7dd2ee95..75221a0b 100644
--- a/helpers/dao/constants.ts
+++ b/helpers/dao/constants.ts
@@ -24,7 +24,7 @@ export interface TribecaPrograms {
 // See `Anchor.toml` for all addresses.
 export const HONEY_DAO_ADDRESSES = {
   Govern: new PublicKey('Govz1VyoyLD5BL6CSCxUJLVLsQHRwjfFj1prNsdNg5Jw'),
-  LockedVoter: new PublicKey(process.env.NEXT_PUBLIC_VOTE_PROGRAM_ID!)
+  LockedVoter: new PublicKey(process.env.NEXT_PUBLIC_VOTER_PROGRAM_ID!)
 };
 
 /**

From 6e61b26a9740a4ef78fc21b7615dca041213e534 Mon Sep 17 00:00:00 2001
From: BowTiedHeron <bowtiedheron@protonmail.com>
Date: Fri, 3 Jun 2022 00:10:54 +0200
Subject: [PATCH 074/101] test vercel

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8502d400..92aae3e6 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Hello and welcome 👋🏼, we are happy to see that you arrived at Honey Labs -
 - <a href="https://github.com/GokiProtocol/walletkit" target="blank">Goki-Wallet:</a> for connecting to Solana wallets
 - <a href="https://degen-xyz.vercel.app/" target="blank">Degen-UI:</a> for styling accopanied by <a href="https://vanilla-extract.style/documentation/setup/" target="blank">Vanilla-Extract</a> for custom CSS classes
 
-
+ 
 
 ##  <span style="color: rgb(235, 85, 69); font-weight: 900">Getting Started</span>
 The Honey Finance Ecosystem consists of several components this repo represents the Front-end.

From 010479d9a35255cff92062de91f456b315fe08c8 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Mon, 6 Jun 2022 10:57:41 +0100
Subject: [PATCH 075/101] fix right overflow on modal

---
 .../ModalContainer/ModalContainer.css.ts      |  2 +-
 .../ProposalConfirmationModal.css.ts          |  9 ++++
 .../ProposalConfirmationModal/index.tsx       | 43 +++++++++++--------
 3 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalConfirmationModal.css.ts

diff --git a/components/ModalContainer/ModalContainer.css.ts b/components/ModalContainer/ModalContainer.css.ts
index ff4b695e..a03ae76f 100644
--- a/components/ModalContainer/ModalContainer.css.ts
+++ b/components/ModalContainer/ModalContainer.css.ts
@@ -7,7 +7,7 @@ export const modalContainer = style({
   pointerEvents: 'none',
   overflow: 'auto',
   cursor: 'pointer',
-  padding: '5rem 0px 0px',
+  padding: '3rem 0px 0px',
   inset: '0',
   zIndex: '99',
   background:
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalConfirmationModal.css.ts b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalConfirmationModal.css.ts
new file mode 100644
index 00000000..d16b60fd
--- /dev/null
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/ProposalConfirmationModal.css.ts
@@ -0,0 +1,9 @@
+import { style } from '@vanilla-extract/css';
+
+export const modalInnerBox = style({});
+
+export const modal = style({
+  display: 'grid',
+  maxHeight: '650px',
+  overflow: 'auto'
+});
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
index 3e1c3cb5..2b003e90 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalConfirmationModal/index.tsx
@@ -17,6 +17,7 @@ import { Modal } from 'components/Modal';
 import { ModalInner } from 'components/Modal/ModalInner';
 import { ProposalIX } from './ProposalIX';
 import ModalContainer from 'components/ModalContainer/ModalContainer';
+import * as styles from './ProposalConfirmationModal.css';
 
 type Props = Omit<ModalProps, 'children'> & {
   proposal: {
@@ -69,26 +70,32 @@ export const ProposalConfirmModal: React.FC<Props> = ({
       isVisible={modalProps.isOpen}
       onClose={modalProps.onDismiss}
     >
-      <Box width="144" display="grid" padding="10" gap="4">
-        <Box paddingBottom="3" borderBottomWidth="0.5">
-          <Text weight="semiBold" align="center" variant="large" ellipsis>
-            Proposal: {proposal.title}
-          </Text>
-        </Box>
-        <HelperCard>
-          <Box marginBottom="3">
+      <Box
+        width="144"
+        className={styles.modal}
+        display="grid"
+        padding="10"
+        gap="4"
+      >
+        <Text weight="semiBold" align="center" variant="large" ellipsis>
+          Proposal: {proposal.title}
+        </Text>
+        <Box paddingTop="3" borderTopWidth="0.5">
+          <HelperCard>
+            <Box marginBottom="3">
+              <Text size="small" lineHeight="1.5" as="p">
+                Tip: The proposal cannot be modified after submission, so please
+                verify all information before submitting.
+              </Text>
+            </Box>
             <Text size="small" lineHeight="1.5" as="p">
-              Tip: The proposal cannot be modified after submission, so please
-              verify all information before submitting.
+              Once submitted, anyone with at least{' '}
+              {minActivationThreshold?.formatUnits()} may start the voting
+              period, i.e., activate the proposal. The voting period will then
+              immediately begin and last for {votingPeriodFmt}.
             </Text>
-          </Box>
-          <Text size="small" lineHeight="1.5" as="p">
-            Once submitted, anyone with at least{' '}
-            {minActivationThreshold?.formatUnits()} may start the voting period,
-            i.e., activate the proposal. The voting period will then immediately
-            begin and last for {votingPeriodFmt}.
-          </Text>
-        </HelperCard>
+          </HelperCard>
+        </Box>
         <Box>
           <Text>
             <ReactMarkdown>{proposal.description}</ReactMarkdown>

From ef2d5e0e7f1228a3c027b549875655a205a60d44 Mon Sep 17 00:00:00 2001
From: codemaster115 <punctualityman@outlook.com>
Date: Tue, 7 Jun 2022 12:40:20 -0500
Subject: [PATCH 076/101] upgrade env

---
 helpers/sdk/constant.ts |  3 ++-
 pages/_app.tsx          | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/helpers/sdk/constant.ts b/helpers/sdk/constant.ts
index 9f550974..0f9163ac 100644
--- a/helpers/sdk/constant.ts
+++ b/helpers/sdk/constant.ts
@@ -10,7 +10,8 @@ export const HONEY_MINT = new PublicKey(
 export const HONEY_DECIMALS = 6;
 
 export const PHONEY_MINT = new PublicKey(
-  '7unYPivFG6cuDGeDVjhbutcjYDcMKPu2mBCnRyJ5Qki2'
+  process.env.NEXT_PUBLIC_PHONEY_MINT ||
+    '7unYPivFG6cuDGeDVjhbutcjYDcMKPu2mBCnRyJ5Qki2'
 );
 
 export const WHITELIST_ENTRY = new PublicKey(
diff --git a/pages/_app.tsx b/pages/_app.tsx
index d84850d6..a058024a 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -14,7 +14,7 @@ import SecPopup from 'components/SecPopup';
 import {
   GOVERNOR_ADDRESS,
   HONEY_MINT,
-  // HONEY_MINT_WRAPPER,
+  HONEY_MINT_WRAPPER,
   SDKProvider
 } from 'helpers/sdk';
 import { GovernorProvider } from 'hooks/tribeca/useGovernor';
@@ -90,10 +90,10 @@ function MyApp({ Component, pageProps }: AppProps) {
               <GovernorProvider
                 initialState={{
                   governor: GOVERNOR_ADDRESS,
-                  govToken: HONEY_MINT
-                  // minter: {
-                  //   mintWrapper: HONEY_MINT_WRAPPER
-                  // }
+                  govToken: HONEY_MINT,
+                  minter: {
+                    mintWrapper: HONEY_MINT_WRAPPER
+                  }
                 }}
               >
                 {/* {children} */}

From 826aa7628c84a5e2f5221a7966b878dc1ba4f75c Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Wed, 8 Jun 2022 22:41:08 +0100
Subject: [PATCH 077/101] custom dropdown

---
 .../CustomDropdown/CustomDropdown.css.ts      | 45 ++++++++++++
 components/CustomDropdown/CustomDropdown.tsx  | 69 +++++++++++++++++++
 .../ProposalTxForm/ProposalTXForm.tsx         | 25 +++----
 3 files changed, 125 insertions(+), 14 deletions(-)
 create mode 100644 components/CustomDropdown/CustomDropdown.css.ts
 create mode 100644 components/CustomDropdown/CustomDropdown.tsx

diff --git a/components/CustomDropdown/CustomDropdown.css.ts b/components/CustomDropdown/CustomDropdown.css.ts
new file mode 100644
index 00000000..2af58d5d
--- /dev/null
+++ b/components/CustomDropdown/CustomDropdown.css.ts
@@ -0,0 +1,45 @@
+import { style } from '@vanilla-extract/css';
+import { vars } from 'degen';
+
+export const dropdown = style({
+  width: '100%',
+  position: 'relative',
+  borderWidth: '2px',
+  borderRadius: vars.radii['2xLarge'],
+  cursor: 'pointer',
+  color: vars.colors.text
+});
+
+export const dropdownFilterSelected = style({
+  padding: '15px 20px'
+});
+
+export const dropdownSelect = style({
+  position: 'absolute',
+  left: '0',
+  top: 'calc(100% + 5px)',
+  width: '100%',
+  listStyle: 'none',
+  background: vars.colors.backgroundSecondary,
+  borderRadius: vars.radii['2xLarge'],
+  margin: '0',
+  padding: '0',
+  borderWidth: '2px',
+  overflow: 'hidden',
+  transitionDuration: '0.5s',
+  cursor: 'pointer'
+});
+
+export const dropdownSelectOption = style({
+  padding: '12px 20px',
+  cursor: 'pointer',
+  borderBottomWidth: '1.5px',
+  borderBottomColor: vars.colors.foregroundSecondary,
+  transitionDuration: '.5s',
+  ':last-child': {
+    borderBottomWidth: 0
+  },
+  ':hover': {
+    background: vars.colors.background
+  }
+});
diff --git a/components/CustomDropdown/CustomDropdown.tsx b/components/CustomDropdown/CustomDropdown.tsx
new file mode 100644
index 00000000..e04f6a5c
--- /dev/null
+++ b/components/CustomDropdown/CustomDropdown.tsx
@@ -0,0 +1,69 @@
+import { style } from '@vanilla-extract/css';
+import {
+  Box,
+  IconCheck,
+  IconChevronDown,
+  IconChevronUp,
+  Stack,
+  Text
+} from 'degen';
+import React, { useState } from 'react';
+import * as styles from './CustomDropdown.css';
+
+type Option = {
+  value: string;
+  title: string;
+};
+
+interface CustomDropdownProps {
+  options: Option[];
+  onChange: (value: string) => void;
+}
+
+const CustomDropdown = (props: CustomDropdownProps) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const [selectedOption, setSelectedOption] = useState(props.options[0]);
+  const onSelect = (option: Option) => {
+    setSelectedOption(option);
+    setIsOpen(false);
+    props.onChange(option.value);
+  };
+  const onOpen = () => {};
+  const onClose = () => {};
+  return (
+    <Box className={styles.dropdown}>
+      <Box
+        onClick={() => setIsOpen(!isOpen)}
+        className={styles.dropdownFilterSelected}
+      >
+        <Stack direction="horizontal" justify="space-between">
+          <Text>{selectedOption.title}</Text>
+          {!isOpen ? <IconChevronDown /> : <IconChevronUp />}
+        </Stack>
+      </Box>
+      <Box
+        display={isOpen ? 'block' : 'none'}
+        className={styles.dropdownSelect}
+      >
+        {props.options.map(
+          (option, i) =>
+            option.title.length > 0 &&
+            option.value.length > 0 && (
+              <Box
+                onClick={() => onSelect(option)}
+                key={option.value}
+                className={styles.dropdownSelectOption}
+              >
+                <Stack direction="horizontal" justify="space-between">
+                  <Text size="small">{option.title}</Text>
+                  {option.value === selectedOption.value && <IconCheck />}
+                </Stack>
+              </Box>
+            )
+        )}
+      </Box>
+    </Box>
+  );
+};
+
+export default CustomDropdown;
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx
index f03ef15f..7de20218 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx
@@ -9,6 +9,7 @@ import { Box, Field, Spinner, Text } from 'degen';
 // import { Select } from '../../../../../common/inputs/InputText';
 // import { LoadingPage } from '../../../../../common/LoadingPage';
 import * as styles from './ProposalTxForm.css';
+import CustomDropdown from 'components/CustomDropdown/CustomDropdown';
 
 interface Props {
   txRaw: string;
@@ -37,26 +38,22 @@ export const ProposalTXForm: React.FC<Props> = ({
   return (
     <Box display="grid" gap="4" htmlFor="proposedAction">
       <Field label={<Text as="span">Proposed Action</Text>}>
-        <select
-          value={actionType}
-          className={styles.actionTypeSelect}
-          onChange={e => {
-            setActionType(e.target.value as ActionType);
+        <CustomDropdown
+          onChange={value => {
+            setActionType(value as ActionType);
             setError(null);
             setTxRaw('');
           }}
-        >
-          {ACTIONS.map(({ title, isEnabled }) => {
+          options={ACTIONS.map(({ title, isEnabled }) => {
             if (isEnabled && ctx && !isEnabled(ctx)) {
-              return null;
+              return { title: '', value: '' };
             }
-            return (
-              <option key={title} value={title}>
-                {title}
-              </option>
-            );
+            return {
+              title,
+              value: title
+            };
           })}
-        </select>
+        />
       </Field>
       {/* <label tw="flex flex-col gap-1" htmlFor="proposedAction">
         <select

From d081675f09b9ec5df4d1ba1ee0d1a10f8767e0a6 Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Wed, 8 Jun 2022 23:24:17 +0100
Subject: [PATCH 078/101] close dropdown on clicking out

---
 components/CustomDropdown/CustomDropdown.tsx | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/components/CustomDropdown/CustomDropdown.tsx b/components/CustomDropdown/CustomDropdown.tsx
index e04f6a5c..e6ce89e0 100644
--- a/components/CustomDropdown/CustomDropdown.tsx
+++ b/components/CustomDropdown/CustomDropdown.tsx
@@ -7,7 +7,7 @@ import {
   Stack,
   Text
 } from 'degen';
-import React, { useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import * as styles from './CustomDropdown.css';
 
 type Option = {
@@ -23,13 +23,24 @@ interface CustomDropdownProps {
 const CustomDropdown = (props: CustomDropdownProps) => {
   const [isOpen, setIsOpen] = useState(false);
   const [selectedOption, setSelectedOption] = useState(props.options[0]);
+  const optionsContainerRef = useRef(null);
   const onSelect = (option: Option) => {
     setSelectedOption(option);
     setIsOpen(false);
     props.onChange(option.value);
   };
-  const onOpen = () => {};
-  const onClose = () => {};
+
+  useEffect(() => {
+    window.onclick = event => {
+      if (isOpen && event.target !== optionsContainerRef.current) {
+        setIsOpen(false);
+      }
+    };
+    return () => {
+      window.onclick = null;
+    };
+  }, [isOpen, setIsOpen, optionsContainerRef]);
+
   return (
     <Box className={styles.dropdown}>
       <Box
@@ -44,6 +55,7 @@ const CustomDropdown = (props: CustomDropdownProps) => {
       <Box
         display={isOpen ? 'block' : 'none'}
         className={styles.dropdownSelect}
+        ref={optionsContainerRef}
       >
         {props.options.map(
           (option, i) =>

From 6d43c3022d1795212fb903530c7fddad7a4c7035 Mon Sep 17 00:00:00 2001
From: BowTiedHeron <bowtiedheron@protonmail.com>
Date: Thu, 9 Jun 2022 10:34:32 +0200
Subject: [PATCH 079/101] added variables to .env.example

---
 .env.example | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index 73708fed..3f17a6af 100644
--- a/.env.example
+++ b/.env.example
@@ -1,7 +1,10 @@
-NEXT_PUBLIC_RPC_NODE = 'https://api.mainnet-beta.solana.com'
-NEXT_PUBLIC_GA=
+NEXT_PUBLIC_RPC_NODE = 'https://api.devnet.solana.com'
+NEXT_PUBLIC_GA= 
+NEXT_PUBLIC_HONEY_MINT=
+NEXT_PUBLIC_PHONEY_MINT=
 NEXT_PUBLIC_STAKE_POOL_ADDR=
 NEXT_PUBLIC_VOTER_PROGRAM_ID=
 NEXT_PUBLIC_GOVERNOR_ADDRESS=
 NEXT_PUBLIC_SMART_WALLET_ADDRESS=
 NEXT_PUBLIC_LOCKER_ADDR=
+NEXT_PUBLIC_HONEY_MINT_WRAPPER=
\ No newline at end of file

From 3ded2e75d19bc03e4f185495d91f40674fb71def Mon Sep 17 00:00:00 2001
From: Oshioke Iyogwoya <danieloshos3@gmail.com>
Date: Thu, 9 Jun 2022 13:08:30 +0100
Subject: [PATCH 080/101] custom dropdown

---
 .../CustomDropdown/CustomDropdown.css.ts      | 45 +++++++++++
 components/CustomDropdown/CustomDropdown.tsx  | 81 +++++++++++++++++++
 .../ProposalTxForm/ProposalTXForm.tsx         | 25 +++---
 3 files changed, 137 insertions(+), 14 deletions(-)
 create mode 100644 components/CustomDropdown/CustomDropdown.css.ts
 create mode 100644 components/CustomDropdown/CustomDropdown.tsx

diff --git a/components/CustomDropdown/CustomDropdown.css.ts b/components/CustomDropdown/CustomDropdown.css.ts
new file mode 100644
index 00000000..2af58d5d
--- /dev/null
+++ b/components/CustomDropdown/CustomDropdown.css.ts
@@ -0,0 +1,45 @@
+import { style } from '@vanilla-extract/css';
+import { vars } from 'degen';
+
+export const dropdown = style({
+  width: '100%',
+  position: 'relative',
+  borderWidth: '2px',
+  borderRadius: vars.radii['2xLarge'],
+  cursor: 'pointer',
+  color: vars.colors.text
+});
+
+export const dropdownFilterSelected = style({
+  padding: '15px 20px'
+});
+
+export const dropdownSelect = style({
+  position: 'absolute',
+  left: '0',
+  top: 'calc(100% + 5px)',
+  width: '100%',
+  listStyle: 'none',
+  background: vars.colors.backgroundSecondary,
+  borderRadius: vars.radii['2xLarge'],
+  margin: '0',
+  padding: '0',
+  borderWidth: '2px',
+  overflow: 'hidden',
+  transitionDuration: '0.5s',
+  cursor: 'pointer'
+});
+
+export const dropdownSelectOption = style({
+  padding: '12px 20px',
+  cursor: 'pointer',
+  borderBottomWidth: '1.5px',
+  borderBottomColor: vars.colors.foregroundSecondary,
+  transitionDuration: '.5s',
+  ':last-child': {
+    borderBottomWidth: 0
+  },
+  ':hover': {
+    background: vars.colors.background
+  }
+});
diff --git a/components/CustomDropdown/CustomDropdown.tsx b/components/CustomDropdown/CustomDropdown.tsx
new file mode 100644
index 00000000..e6ce89e0
--- /dev/null
+++ b/components/CustomDropdown/CustomDropdown.tsx
@@ -0,0 +1,81 @@
+import { style } from '@vanilla-extract/css';
+import {
+  Box,
+  IconCheck,
+  IconChevronDown,
+  IconChevronUp,
+  Stack,
+  Text
+} from 'degen';
+import React, { useEffect, useRef, useState } from 'react';
+import * as styles from './CustomDropdown.css';
+
+type Option = {
+  value: string;
+  title: string;
+};
+
+interface CustomDropdownProps {
+  options: Option[];
+  onChange: (value: string) => void;
+}
+
+const CustomDropdown = (props: CustomDropdownProps) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const [selectedOption, setSelectedOption] = useState(props.options[0]);
+  const optionsContainerRef = useRef(null);
+  const onSelect = (option: Option) => {
+    setSelectedOption(option);
+    setIsOpen(false);
+    props.onChange(option.value);
+  };
+
+  useEffect(() => {
+    window.onclick = event => {
+      if (isOpen && event.target !== optionsContainerRef.current) {
+        setIsOpen(false);
+      }
+    };
+    return () => {
+      window.onclick = null;
+    };
+  }, [isOpen, setIsOpen, optionsContainerRef]);
+
+  return (
+    <Box className={styles.dropdown}>
+      <Box
+        onClick={() => setIsOpen(!isOpen)}
+        className={styles.dropdownFilterSelected}
+      >
+        <Stack direction="horizontal" justify="space-between">
+          <Text>{selectedOption.title}</Text>
+          {!isOpen ? <IconChevronDown /> : <IconChevronUp />}
+        </Stack>
+      </Box>
+      <Box
+        display={isOpen ? 'block' : 'none'}
+        className={styles.dropdownSelect}
+        ref={optionsContainerRef}
+      >
+        {props.options.map(
+          (option, i) =>
+            option.title.length > 0 &&
+            option.value.length > 0 && (
+              <Box
+                onClick={() => onSelect(option)}
+                key={option.value}
+                className={styles.dropdownSelectOption}
+              >
+                <Stack direction="horizontal" justify="space-between">
+                  <Text size="small">{option.title}</Text>
+                  {option.value === selectedOption.value && <IconCheck />}
+                </Stack>
+              </Box>
+            )
+        )}
+      </Box>
+    </Box>
+  );
+};
+
+export default CustomDropdown;
diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx
index fbc72375..7976afc4 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalTxForm/ProposalTXForm.tsx
@@ -9,6 +9,7 @@ import { Box, Field, Spinner, Text } from 'degen';
 // import { Select } from '../../../../../common/inputs/InputText';
 // import { LoadingPage } from '../../../../../common/LoadingPage';
 import * as styles from './ProposalTxForm.css';
+import CustomDropdown from 'components/CustomDropdown/CustomDropdown';
 
 interface Props {
   txRaw: string;
@@ -37,26 +38,22 @@ export const ProposalTXForm: React.FC<Props> = ({
   return (
     <Box display="grid" gap="4" htmlFor="proposedAction">
       <Field label={<Text as="span">Proposed Action</Text>}>
-        <select
-          value={actionType}
-          className={styles.actionTypeSelect}
-          onChange={e => {
-            setActionType(e.target.value as ActionType);
+        <CustomDropdown
+          onChange={value => {
+            setActionType(value as ActionType);
             setError(null);
             setTxRaw('');
           }}
-        >
-          {ACTIONS.map(({ title, isEnabled }) => {
+          options={ACTIONS.map(({ title, isEnabled }) => {
             if (isEnabled && ctx && !isEnabled(ctx)) {
-              return null;
+              return { title: '', value: '' };
             }
-            return (
-              <option key={title} value={title}>
-                {title}
-              </option>
-            );
+            return {
+              title,
+              value: title
+            };
           })}
-        </select>
+        />
       </Field>
       {/* <label tw="flex flex-col gap-1" htmlFor="proposedAction">
         <select

From 17e183ec9dcd63f64cb184fd8e68f8405c9766ed Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Tue, 26 Jul 2022 22:56:58 +0200
Subject: [PATCH 081/101] feat: add tribeca v2 IDLs

---
 helpers/idl/stake.json    |  98 ++-----
 helpers/idl/ve_honey.json | 596 ++++----------------------------------
 2 files changed, 74 insertions(+), 620 deletions(-)

diff --git a/helpers/idl/stake.json b/helpers/idl/stake.json
index 5396d09c..d3e5173b 100644
--- a/helpers/idl/stake.json
+++ b/helpers/idl/stake.json
@@ -88,6 +88,27 @@
         }
       ]
     },
+    {
+      "name": "setOwner",
+      "accounts": [
+        {
+          "name": "owner",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "poolInfo",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "newOwner",
+          "type": "publicKey"
+        }
+      ]
+    },
     {
       "name": "setMintAuthority",
       "accounts": [
@@ -357,81 +378,6 @@
           "type": "i64"
         }
       ]
-    },
-    {
-      "name": "stakeV2",
-      "accounts": [
-        {
-          "name": "poolInfo",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "tokenMint",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "pTokenMint",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "pTokenFrom",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "userAuthority",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "tokenVault",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "authority",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "locker",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "escrow",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "lockedTokens",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "lockerProgram",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "tokenProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "amount",
-          "type": "u64"
-        },
-        {
-          "name": "duration",
-          "type": "i64"
-        }
-      ]
     }
   ],
   "accounts": [
@@ -561,4 +507,4 @@
       "msg": "Anchor serialization error"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/helpers/idl/ve_honey.json b/helpers/idl/ve_honey.json
index 6a881173..d6f08290 100644
--- a/helpers/idl/ve_honey.json
+++ b/helpers/idl/ve_honey.json
@@ -4,418 +4,6 @@
   "instructions": [
     {
       "name": "initLocker",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "base",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "locker",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "tokenMint",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "admin",
-          "type": "publicKey"
-        },
-        {
-          "name": "params",
-          "type": {
-            "defined": "LockerParams"
-          }
-        }
-      ]
-    },
-    {
-      "name": "setLockerParams",
-      "accounts": [
-        {
-          "name": "admin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "locker",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "params",
-          "type": {
-            "defined": "LockerParams"
-          }
-        }
-      ]
-    },
-    {
-      "name": "initEscrow",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "locker",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "escrow",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "escrowOwner",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
-    {
-      "name": "approveProgramLockPrivilege",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "locker",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "lockerAdmin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "whitelistEntry",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "executableId",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "whitelistedOwner",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
-    {
-      "name": "revokeProgramLockPrivilege",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "locker",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "lockerAdmin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "whitelistEntry",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "executableId",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
-    {
-      "name": "lock",
-      "accounts": [
-        {
-          "name": "locker",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "escrow",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "lockedTokens",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "escrowOwner",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "sourceTokens",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "sourceTokensAuthority",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "tokenProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "amount",
-          "type": "u64"
-        },
-        {
-          "name": "duration",
-          "type": "i64"
-        }
-      ]
-    },
-    {
-      "name": "exit",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "locker",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "escrow",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "escrowOwner",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "lockedTokens",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "destinationTokens",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "tokenProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
-    {
-      "name": "migrateLocker",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "base",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "locker",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "newBase",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "newLocker",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "governor",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "smartWallet",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "proposalActivationMinVotes",
-          "type": "u64"
-        }
-      ]
-    },
-    {
-      "name": "migrateEscrow",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "lockerAdmin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "oldLocker",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "newLocker",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "oldEscrow",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "newEscrow",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "oldLockedTokens",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "newLockedTokens",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "escrowOwner",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "tokenProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
-    {
-      "name": "migrateWhitelist",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "oldLocker",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "newLocker",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "lockerAdmin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "whitelistEntry",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "newWhitelistEntry",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
-    {
-      "name": "initLockerV2",
       "accounts": [
         {
           "name": "payer",
@@ -452,13 +40,13 @@
         {
           "name": "params",
           "type": {
-            "defined": "LockerParamsV2"
+            "defined": "LockerParams"
           }
         }
       ]
     },
     {
-      "name": "initEscrowV2",
+      "name": "initEscrow",
       "accounts": [
         {
           "name": "payer",
@@ -489,7 +77,7 @@
       "args": []
     },
     {
-      "name": "setLockerParamsV2",
+      "name": "setLockerParams",
       "accounts": [
         {
           "name": "locker",
@@ -511,13 +99,13 @@
         {
           "name": "params",
           "type": {
-            "defined": "LockerParamsV2"
+            "defined": "LockerParams"
           }
         }
       ]
     },
     {
-      "name": "approveProgramLockPrivilegeV2",
+      "name": "approveProgramLockPrivilege",
       "accounts": [
         {
           "name": "payer",
@@ -563,7 +151,7 @@
       "args": []
     },
     {
-      "name": "revokeProgramLockPrivilegeV2",
+      "name": "revokeProgramLockPrivilege",
       "accounts": [
         {
           "name": "payer",
@@ -594,7 +182,7 @@
       "args": []
     },
     {
-      "name": "lockV2",
+      "name": "lock",
       "accounts": [
         {
           "name": "locker",
@@ -644,7 +232,7 @@
       ]
     },
     {
-      "name": "exitV2",
+      "name": "exit",
       "accounts": [
         {
           "name": "payer",
@@ -765,47 +353,32 @@
           "type": "u8"
         }
       ]
+    },
+    {
+      "name": "setVoteDelegate",
+      "accounts": [
+        {
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "newDelegate",
+          "type": "publicKey"
+        }
+      ]
     }
   ],
   "accounts": [
     {
       "name": "Escrow",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "locker",
-            "type": "publicKey"
-          },
-          {
-            "name": "owner",
-            "type": "publicKey"
-          },
-          {
-            "name": "bump",
-            "type": "u8"
-          },
-          {
-            "name": "tokens",
-            "type": "publicKey"
-          },
-          {
-            "name": "amount",
-            "type": "u64"
-          },
-          {
-            "name": "escrowStartedAt",
-            "type": "i64"
-          },
-          {
-            "name": "escrowEndsAt",
-            "type": "i64"
-          }
-        ]
-      }
-    },
-    {
-      "name": "EscrowV2",
       "type": {
         "kind": "struct",
         "fields": [
@@ -846,40 +419,6 @@
     },
     {
       "name": "Locker",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "base",
-            "type": "publicKey"
-          },
-          {
-            "name": "bump",
-            "type": "u8"
-          },
-          {
-            "name": "tokenMint",
-            "type": "publicKey"
-          },
-          {
-            "name": "lockedSupply",
-            "type": "u64"
-          },
-          {
-            "name": "admin",
-            "type": "publicKey"
-          },
-          {
-            "name": "params",
-            "type": {
-              "defined": "LockerParams"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "name": "LockerV2",
       "type": {
         "kind": "struct",
         "fields": [
@@ -906,7 +445,7 @@
           {
             "name": "params",
             "type": {
-              "defined": "LockerParamsV2"
+              "defined": "LockerParams"
             }
           }
         ]
@@ -958,34 +497,10 @@
           {
             "name": "multiplier",
             "type": "u8"
-          }
-        ]
-      }
-    },
-    {
-      "name": "LockerParamsV2",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "minStakeDuration",
-            "type": "u64"
-          },
-          {
-            "name": "maxStakeDuration",
-            "type": "u64"
           },
           {
             "name": "proposalActivationMinVotes",
             "type": "u64"
-          },
-          {
-            "name": "whitelistEnabled",
-            "type": "bool"
-          },
-          {
-            "name": "multiplier",
-            "type": "u8"
           }
         ]
       }
@@ -1049,33 +564,6 @@
     },
     {
       "name": "InitLockerEvent",
-      "fields": [
-        {
-          "name": "locker",
-          "type": "publicKey",
-          "index": false
-        },
-        {
-          "name": "tokenMint",
-          "type": "publicKey",
-          "index": false
-        },
-        {
-          "name": "admin",
-          "type": "publicKey",
-          "index": false
-        },
-        {
-          "name": "params",
-          "type": {
-            "defined": "LockerParams"
-          },
-          "index": false
-        }
-      ]
-    },
-    {
-      "name": "InitLockerV2Event",
       "fields": [
         {
           "name": "locker",
@@ -1095,7 +583,7 @@
         {
           "name": "params",
           "type": {
-            "defined": "LockerParamsV2"
+            "defined": "LockerParams"
           },
           "index": false
         }
@@ -1151,6 +639,26 @@
         }
       ]
     },
+    {
+      "name": "SetVoteDelegateEvent",
+      "fields": [
+        {
+          "name": "escrowOwner",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "oldDelegate",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "newDelegate",
+          "type": "publicKey",
+          "index": false
+        }
+      ]
+    },
     {
       "name": "ApproveLockPrivilegeEvent",
       "fields": [
@@ -1279,4 +787,4 @@
       "msg": "Insufficient voting power to activate a proposal"
     }
   ]
-}
+}
\ No newline at end of file

From 66d00ca6a285564de07a3548499a59e128c4ab81 Mon Sep 17 00:00:00 2001
From: BowTiedHeron <bowtiedheron@protonmail.com>
Date: Wed, 27 Jul 2022 10:09:56 +0200
Subject: [PATCH 082/101] changed proposal copy; veHONEY required to activate a
 proposal and amount of votes required

---
 .../ProposalCreateView/locked-voter/ProposalCreateInner.tsx   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
index 11f3de49..a8f81256 100644
--- a/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
+++ b/components/Proposals/ProposalCreateView/locked-voter/ProposalCreateInner.tsx
@@ -117,9 +117,9 @@ export const ProposalCreateInner: React.FC = () => {
               <Text as="p">
                 1) Please make sure to start a discussion on the forum to see if there is sufficient support for your proposal.<br />
                 <br />
-                2) Draft proposals can only be activated by a DAO member with at least 1,000,000 $honey, all members of the DAO may vote to execute or reject the proposal.<br />
+                2) Draft proposals can only be activated by a DAO member with at least 10,000 $veHONEY, all members of the DAO may vote to execute or reject the proposal.<br />
                 <br />
-                3) For a proposal to be executed there should be a minimum of 50,000,000 $honey votes casted resulting in at least 2/3 of the votes for one option.
+                3) For a proposal to be executed there should be a minimum of 10,000,000 $veHONEY votes casted resulting in at least 2/3 of the votes for one option.
               </Text>
             </Stack>
           </Card>

From d436067d8c1df091241c8d49f68e4ecf1405bf12 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Fri, 29 Jul 2022 15:50:33 +0200
Subject: [PATCH 083/101] feat(governance): add governance v2

---
 components/HoneyModal/HoneyModal.tsx       |    2 +-
 components/PHoneyModal/PHoneyModal.tsx     |    2 +-
 components/VeHoneyModal/VeHoneyModal.tsx   |    2 +-
 helpers/dao/programs/lockedVoter.ts        |   10 +-
 helpers/dao/sdk.ts                         |    2 +-
 helpers/dao/wrappers/lockedVoter/escrow.ts |   14 +-
 helpers/dao/wrappers/lockedVoter/locker.ts |   32 +-
 helpers/parser.ts                          |    8 +-
 helpers/programs/veHoney.ts                |   10 +-
 helpers/sdk/stake.ts                       |    2 +-
 helpers/sdk/vehoney.ts                     |   14 +-
 helpers/types/stake.ts                     | 1330 +++++----
 helpers/types/ve_honey.ts                  | 2842 +++++++-------------
 hooks/useStake.tsx                         |    8 +-
 14 files changed, 1593 insertions(+), 2685 deletions(-)

diff --git a/components/HoneyModal/HoneyModal.tsx b/components/HoneyModal/HoneyModal.tsx
index 69abd2f0..45631124 100644
--- a/components/HoneyModal/HoneyModal.tsx
+++ b/components/HoneyModal/HoneyModal.tsx
@@ -38,7 +38,7 @@ const HoneyModal = () => {
   // ======================== Should replace with configuration ================
   const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
   const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
+    process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
       '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
   );
   const LOCKER_ADDRESS = new PublicKey(
diff --git a/components/PHoneyModal/PHoneyModal.tsx b/components/PHoneyModal/PHoneyModal.tsx
index 449c88fe..3e67cdfd 100644
--- a/components/PHoneyModal/PHoneyModal.tsx
+++ b/components/PHoneyModal/PHoneyModal.tsx
@@ -22,7 +22,7 @@ const PHoneyModal = () => {
   // ======================== Should replace with configuration ================
   const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
   const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
+    process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
       '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
   );
   const LOCKER_ADDRESS = new PublicKey(
diff --git a/components/VeHoneyModal/VeHoneyModal.tsx b/components/VeHoneyModal/VeHoneyModal.tsx
index 8b3f6c14..07c65957 100644
--- a/components/VeHoneyModal/VeHoneyModal.tsx
+++ b/components/VeHoneyModal/VeHoneyModal.tsx
@@ -55,7 +55,7 @@ const VeHoneyModal = () => {
   // ======================== Should replace with configuration ================
   const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
   const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
+    process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
       '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
   );
   const LOCKER_ADDRESS = new PublicKey(
diff --git a/helpers/dao/programs/lockedVoter.ts b/helpers/dao/programs/lockedVoter.ts
index 854022dc..cac56e8b 100644
--- a/helpers/dao/programs/lockedVoter.ts
+++ b/helpers/dao/programs/lockedVoter.ts
@@ -5,18 +5,18 @@ import type { VeHoney as VoterIDL } from '../../types/ve_honey';
 export type LockedVoterTypes = AnchorTypes<
   VoterIDL,
   {
-    lockerV2: LockerV2Data;
-    escrowV2: EscrowV2Data;
+    locker: LockerData;
+    escrow: EscrowData;
     lockerWhitelistEntry: LockerWhitelistEntryData;
   }
 >;
 
 type Accounts = LockedVoterTypes['Accounts'];
-export type LockerV2Data = Accounts['lockerV2'];
-export type EscrowV2Data = Accounts['escrowV2'];
+export type LockerData = Accounts['locker'];
+export type EscrowData = Accounts['escrow'];
 export type LockerWhitelistEntryData = Accounts['whitelistEntry'];
 
-export type LockerParamsV2 = LockedVoterTypes['Defined']['LockerParamsV2'];
+export type LockerParamsV2 = LockedVoterTypes['Defined']['LockerParams'];
 
 export type LockedVoterError = LockedVoterTypes['Error'];
 export type LockedVoterProgram = LockedVoterTypes['Program'];
diff --git a/helpers/dao/sdk.ts b/helpers/dao/sdk.ts
index 4f2c0b53..a2cbc121 100644
--- a/helpers/dao/sdk.ts
+++ b/helpers/dao/sdk.ts
@@ -83,7 +83,7 @@ export class TribecaSDK {
       tx: new TransactionEnvelope(
         this.provider,
         [
-          this.programs.LockedVoter.instruction.initLockerV2(lockerParams, {
+          this.programs.LockedVoter.instruction.initLocker(lockerParams, {
             accounts: {
               base: baseKP.publicKey,
               governor,
diff --git a/helpers/dao/wrappers/lockedVoter/escrow.ts b/helpers/dao/wrappers/lockedVoter/escrow.ts
index 8a08b052..93f2c7a9 100644
--- a/helpers/dao/wrappers/lockedVoter/escrow.ts
+++ b/helpers/dao/wrappers/lockedVoter/escrow.ts
@@ -10,14 +10,14 @@ import { SystemProgram } from '@solana/web3.js';
 import BN from 'bn.js';
 
 import { HONEY_DAO_ADDRESSES } from '../../constants';
-import type { EscrowV2Data, LockerV2Data } from '../../programs/lockedVoter';
+import type { EscrowData, LockerData } from '../../programs/lockedVoter';
 import type { TribecaSDK } from '../../sdk';
 import { findVoteAddress } from '../govern/pda';
 import type { VoteSide } from '../govern/types';
 
 export class VoteEscrow {
-  private _lockerData: LockerV2Data | null = null;
-  private _escrowData: EscrowV2Data | null = null;
+  private _lockerData: LockerData | null = null;
+  private _escrowData: EscrowData | null = null;
 
   constructor(
     readonly sdk: TribecaSDK,
@@ -40,7 +40,7 @@ export class VoteEscrow {
    */
   async lockerData() {
     if (!this._lockerData) {
-      this._lockerData = await this.lockerProgram.account.lockerV2.fetch(
+      this._lockerData = await this.lockerProgram.account.locker.fetch(
         this.locker
       );
     }
@@ -52,7 +52,7 @@ export class VoteEscrow {
    */
   async data() {
     if (!this._escrowData) {
-      this._escrowData = await this.lockerProgram.account.escrowV2.fetch(
+      this._escrowData = await this.lockerProgram.account.escrow.fetch(
         this.escrowKey
       );
     }
@@ -183,7 +183,7 @@ export class VoteEscrow {
       owner: escrowData.owner
     });
     return this.provider.newTX([
-      this.lockerProgram.instruction.lockV2(
+      this.lockerProgram.instruction.lock(
         amount.toU64(),
         new BN(durationSeconds),
         {
@@ -215,7 +215,7 @@ export class VoteEscrow {
     });
     return this.provider.newTX([
       destinationTokens.instruction,
-      this.lockerProgram.instruction.exitV2({
+      this.lockerProgram.instruction.exit({
         accounts: {
           locker: this.locker,
           escrow: this.escrowKey,
diff --git a/helpers/dao/wrappers/lockedVoter/locker.ts b/helpers/dao/wrappers/lockedVoter/locker.ts
index 832cd9a1..14d7107e 100644
--- a/helpers/dao/wrappers/lockedVoter/locker.ts
+++ b/helpers/dao/wrappers/lockedVoter/locker.ts
@@ -14,9 +14,9 @@ import invariant from 'tiny-invariant';
 
 import { HONEY_DAO_ADDRESSES } from '../../constants';
 import type {
-  EscrowV2Data,
+  EscrowData,
   LockedVoterProgram,
-  LockerV2Data,
+  LockerData,
   LockerParamsV2,
   ProposalData
 } from '../../programs';
@@ -33,7 +33,7 @@ export class LockerWrapper {
   readonly program: LockedVoterProgram;
   readonly governor: GovernorWrapper;
 
-  private _lockerData: LockerV2Data | null = null;
+  private _lockerData: LockerData | null = null;
 
   constructor(
     readonly sdk: TribecaSDK,
@@ -58,21 +58,21 @@ export class LockerWrapper {
    * Fetches the data of the locker.
    * @returns
    */
-  async reload(): Promise<LockerV2Data> {
-    return this.program.account.lockerV2.fetch(this.locker);
+  async reload(): Promise<LockerData> {
+    return this.program.account.locker.fetch(this.locker);
   }
 
   async fetchProposalData(proposalKey: PublicKey): Promise<ProposalData> {
     return await this.sdk.govern.program.account.proposal.fetch(proposalKey);
   }
 
-  async fetchEscrow(escrowKey: PublicKey): Promise<EscrowV2Data> {
-    return await this.program.account.escrowV2.fetch(escrowKey);
+  async fetchEscrow(escrowKey: PublicKey): Promise<EscrowData> {
+    return await this.program.account.escrow.fetch(escrowKey);
   }
 
   async fetchEscrowByAuthority(
     authority: PublicKey = this.sdk.provider.wallet.publicKey
-  ): Promise<EscrowV2Data> {
+  ): Promise<EscrowData> {
     const [escrowKey] = await findEscrowAddress(this.locker, authority);
     return this.fetchEscrow(escrowKey);
   }
@@ -81,7 +81,7 @@ export class LockerWrapper {
    * Fetches the data of the locker.
    * @returns
    */
-  async data(): Promise<LockerV2Data> {
+  async data(): Promise<LockerData> {
     if (!this._lockerData) {
       this._lockerData = await this.reload();
     }
@@ -95,7 +95,7 @@ export class LockerWrapper {
     instruction: TransactionInstruction | null;
   }> {
     const [escrow] = await findEscrowAddress(this.locker, authority);
-    const escrowData = await this.program.account.escrowV2.fetchNullable(
+    const escrowData = await this.program.account.escrow.fetchNullable(
       escrow
     );
     if (escrowData) {
@@ -117,7 +117,7 @@ export class LockerWrapper {
     authority: PublicKey = this.sdk.provider.wallet.publicKey
   ): Promise<TransactionInstruction> {
     const [escrow] = await findEscrowAddress(this.locker, authority);
-    return this.program.instruction.initEscrowV2({
+    return this.program.instruction.initEscrow({
       accounts: {
         locker: this.locker,
         escrow,
@@ -172,7 +172,7 @@ export class LockerWrapper {
     const lockerData = await this.reload();
 
     instructions.push(
-      this.program.instruction.lockV2(amount, duration, {
+      this.program.instruction.lock(amount, duration, {
         accounts: {
           locker: this.locker,
           escrow: escrow,
@@ -265,7 +265,7 @@ export class LockerWrapper {
     const { govTokenAccount, instructions } =
       await this._getOrCreateGovTokenATAsInternal(authority, escrow);
     instructions.push(
-      this.program.instruction.exitV2({
+      this.program.instruction.exit({
         accounts: {
           locker: this.locker,
           escrow,
@@ -360,7 +360,7 @@ export class LockerWrapper {
     const governorData = await this.sdk.programs.Govern.account.governor.fetch(
       lockerData.governor
     );
-    return this.program.instruction.approveProgramLockPrivilegeV2({
+    return this.program.instruction.approveProgramLockPrivilege({
       accounts: {
         locker: this.locker,
         whitelistEntry,
@@ -387,7 +387,7 @@ export class LockerWrapper {
     const governorData = await this.sdk.programs.Govern.account.governor.fetch(
       lockerData.governor
     );
-    return this.program.instruction.revokeProgramLockPrivilegeV2({
+    return this.program.instruction.revokeProgramLockPrivilege({
       accounts: {
         locker: this.locker,
         whitelistEntry,
@@ -406,7 +406,7 @@ export class LockerWrapper {
       lockerData.governor
     );
 
-    return this.program.instruction.setLockerParamsV2(args, {
+    return this.program.instruction.setLockerParams(args, {
       accounts: {
         locker: this.locker,
         governor: lockerData.governor,
diff --git a/helpers/parser.ts b/helpers/parser.ts
index 07c3185c..214e1a81 100644
--- a/helpers/parser.ts
+++ b/helpers/parser.ts
@@ -19,8 +19,8 @@ export const {
     useData: useParsedProposalMetas,
     useSingleData: useParsedProposalMeta
   },
-  lockerV2: { useData: useParsedLockers, useSingleData: useParsedLocker },
-  escrowV2: { useData: useParsedEscrows, useSingleData: useParsedEscrow },
+  locker: { useData: useParsedLockers, useSingleData: useParsedLocker },
+  escrow: { useData: useParsedEscrows, useSingleData: useParsedEscrow },
   governor: { useData: useParsedGovernors, useSingleData: useParsedGovernor },
   vote: { useData: useParsedVotes, useSingleData: useParsedVote },
   mintWrapper: {
@@ -55,8 +55,8 @@ export const {
 } = makeProgramParserHooks(GOKI_CODERS.SmartWallet);
 
 export const {
-  escrowV2: { useSingleData: useEscrowData },
-  lockerV2: { useSingleData: useLockerData }
+  escrow: { useSingleData: useEscrowData },
+  locker: { useSingleData: useLockerData }
 } = makeProgramParserHooks(HONEY_DAO_CODERS.LockedVoter);
 
 export const {
diff --git a/helpers/programs/veHoney.ts b/helpers/programs/veHoney.ts
index 6a6eaea3..5f729ef3 100644
--- a/helpers/programs/veHoney.ts
+++ b/helpers/programs/veHoney.ts
@@ -5,18 +5,18 @@ import type { VeHoney as VoterIDL } from '../types/ve_honey';
 export type LockedVoterTypes = AnchorTypes<
   VoterIDL,
   {
-    lockerV2: LockerV2Data;
-    escrowV2: EscrowV2Data;
+    locker: LockerData;
+    escrow: EscrowData;
     lockerWhitelistEntry: LockerWhitelistEntryData;
   }
 >;
 
 type Accounts = LockedVoterTypes['Accounts'];
-export type LockerV2Data = Accounts['lockerV2'];
-export type EscrowV2Data = Accounts['escrowV2'];
+export type LockerData = Accounts['locker'];
+export type EscrowData = Accounts['escrow'];
 export type LockerWhitelistEntryData = Accounts['whitelistEntry'];
 
-export type LockerParamsV2 = LockedVoterTypes['Defined']['LockerParamsV2'];
+export type LockerParamsV2 = LockedVoterTypes['Defined']['LockerParams'];
 
 export type LockedVoterError = LockedVoterTypes['Error'];
 export type LockedVoterProgram = LockedVoterTypes['Program'];
diff --git a/helpers/sdk/stake.ts b/helpers/sdk/stake.ts
index 84edc24d..538dfceb 100644
--- a/helpers/sdk/stake.ts
+++ b/helpers/sdk/stake.ts
@@ -186,7 +186,7 @@ export class StakeClient extends ClientBase<Stake> {
     const lockedTokens = await veHoneyClient.getEscrowLockedTokenPDA(escrow);
     const lockerProgram = veHoneyClient.getProgramId();
 
-    const txSig = await this.program.rpc.stakeV2(
+    const txSig = await this.program.rpc.stake(
       new anchor.BN(amount),
       new anchor.BN(duration),
       {
diff --git a/helpers/sdk/vehoney.ts b/helpers/sdk/vehoney.ts
index 3fb68d90..a99b419b 100644
--- a/helpers/sdk/vehoney.ts
+++ b/helpers/sdk/vehoney.ts
@@ -117,7 +117,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
     return { txSig, destination };
   }
 
-  async lock(
+  async lockV2(
     locker: PublicKey,
     source: PublicKey,
     amount: anchor.BN,
@@ -164,7 +164,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
 
   async fetchLockerV2(locker: PublicKey) {
     try {
-      return await this.program.account.lockerV2.fetch(locker);
+      return await this.program.account.locker.fetch(locker);
     } catch (e) {
       console.log(e);
     }
@@ -172,7 +172,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
 
   async fetchEscrowV2(escrow: PublicKey) {
     try {
-      return await this.program.account.escrowV2.fetch(escrow);
+      return await this.program.account.escrow.fetch(escrow);
     } catch (e) {
       console.log(e);
     }
@@ -192,7 +192,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
         this.wallet.publicKey
       ),
       await this.program.methods
-        .initEscrowV2()
+        .initEscrow()
         .accounts({
           payer: this.wallet.publicKey,
           locker,
@@ -237,7 +237,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
     const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
 
     const txSig = await this.program.methods
-      .exitV2()
+      .exit()
       .accounts({
         payer: this.wallet.publicKey,
         locker,
@@ -253,7 +253,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
     return { txSig, destination };
   }
 
-  async lockV2(
+  async lock(
     locker: PublicKey,
     source: PublicKey,
     amount: anchor.BN,
@@ -282,7 +282,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
     const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
 
     const txSig = await this.program.methods
-      .lockV2(new anchor.BN(amount), new anchor.BN(duration))
+      .lock(new anchor.BN(amount), new anchor.BN(duration))
       .accounts({
         locker,
         escrow,
diff --git a/helpers/types/stake.ts b/helpers/types/stake.ts
index ec03a791..1bf7ed68 100644
--- a/helpers/types/stake.ts
+++ b/helpers/types/stake.ts
@@ -1,1129 +1,1021 @@
 export type Stake = {
-  version: '0.1.0';
-  name: 'stake';
-  instructions: [
+  "version": "0.1.0",
+  "name": "stake",
+  "instructions": [
     {
-      name: 'initialize';
-      accounts: [
+      "name": "initialize",
+      "accounts": [
         {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'owner';
-          isMut: false;
-          isSigner: true;
+          "name": "owner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'tokenMint';
-          isMut: false;
-          isSigner: false;
+          "name": "tokenMint",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'pTokenMint';
-          isMut: false;
-          isSigner: false;
+          "name": "pTokenMint",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'poolInfo';
-          isMut: true;
-          isSigner: false;
+          "name": "poolInfo",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'tokenVault';
-          isMut: true;
-          isSigner: false;
+          "name": "tokenVault",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'authority';
-          isMut: false;
-          isSigner: false;
+          "name": "authority",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'systemProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'rent';
-          isMut: false;
-          isSigner: false;
+          "name": "rent",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
-      args: [
+      ],
+      "args": [
         {
-          name: 'params';
-          type: {
-            defined: 'PoolParams';
-          };
+          "name": "params",
+          "type": {
+            "defined": "PoolParams"
+          }
         }
-      ];
+      ]
     },
     {
-      name: 'modifyParams';
-      accounts: [
+      "name": "modifyParams",
+      "accounts": [
         {
-          name: 'owner';
-          isMut: false;
-          isSigner: true;
+          "name": "owner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'poolInfo';
-          isMut: true;
-          isSigner: false;
+          "name": "poolInfo",
+          "isMut": true,
+          "isSigner": false
         }
-      ];
-      args: [
+      ],
+      "args": [
         {
-          name: 'params';
-          type: {
-            defined: 'PoolParams';
-          };
+          "name": "params",
+          "type": {
+            "defined": "PoolParams"
+          }
         }
-      ];
+      ]
     },
     {
-      name: 'setMintAuthority';
-      accounts: [
+      "name": "setOwner",
+      "accounts": [
         {
-          name: 'owner';
-          isMut: false;
-          isSigner: true;
+          "name": "owner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'poolInfo';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'tokenMint';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'authority';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'originAuthority';
-          isMut: false;
-          isSigner: true;
-        },
+          "name": "poolInfo",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
         {
-          name: 'tokenProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "newOwner",
+          "type": "publicKey"
         }
-      ];
-      args: [];
+      ]
     },
     {
-      name: 'reclaimMintAuthority';
-      accounts: [
+      "name": "setMintAuthority",
+      "accounts": [
         {
-          name: 'owner';
-          isMut: false;
-          isSigner: true;
+          "name": "owner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'poolInfo';
-          isMut: false;
-          isSigner: false;
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenMint';
-          isMut: true;
-          isSigner: false;
+          "name": "tokenMint",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'authority';
-          isMut: false;
-          isSigner: false;
+          "name": "authority",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenProgram';
-          isMut: false;
-          isSigner: false;
-        }
-      ];
-      args: [
+          "name": "originAuthority",
+          "isMut": false,
+          "isSigner": true
+        },
         {
-          name: 'mintAuthority';
-          type: 'publicKey';
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
+      ],
+      "args": []
     },
     {
-      name: 'initializeUser';
-      accounts: [
+      "name": "reclaimMintAuthority",
+      "accounts": [
         {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
+          "name": "owner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'poolInfo';
-          isMut: false;
-          isSigner: false;
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'userInfo';
-          isMut: true;
-          isSigner: false;
+          "name": "tokenMint",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'userOwner';
-          isMut: false;
-          isSigner: true;
+          "name": "authority",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'systemProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
-      args: [];
+      ],
+      "args": [
+        {
+          "name": "mintAuthority",
+          "type": "publicKey"
+        }
+      ]
     },
     {
-      name: 'deposit';
-      accounts: [
+      "name": "initializeUser",
+      "accounts": [
         {
-          name: 'poolInfo';
-          isMut: false;
-          isSigner: false;
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'userInfo';
-          isMut: true;
-          isSigner: false;
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'userOwner';
-          isMut: false;
-          isSigner: true;
+          "name": "userInfo",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'pTokenMint';
-          isMut: true;
-          isSigner: false;
+          "name": "userOwner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'source';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'userAuthority';
-          isMut: false;
-          isSigner: true;
-        },
-        {
-          name: 'tokenProgram';
-          isMut: false;
-          isSigner: false;
-        }
-      ];
-      args: [
-        {
-          name: 'amount';
-          type: 'u64';
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
+      ],
+      "args": []
     },
     {
-      name: 'claim';
-      accounts: [
+      "name": "deposit",
+      "accounts": [
         {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'poolInfo';
-          isMut: false;
-          isSigner: false;
+          "name": "userInfo",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'authority';
-          isMut: false;
-          isSigner: false;
+          "name": "userOwner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'tokenMint';
-          isMut: true;
-          isSigner: false;
+          "name": "pTokenMint",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'userInfo';
-          isMut: true;
-          isSigner: false;
+          "name": "source",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'userOwner';
-          isMut: false;
-          isSigner: true;
+          "name": "userAuthority",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'destination';
-          isMut: true;
-          isSigner: false;
-        },
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
         {
-          name: 'tokenProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "amount",
+          "type": "u64"
         }
-      ];
-      args: [];
+      ]
     },
     {
-      name: 'stake';
-      accounts: [
-        {
-          name: 'poolInfo';
-          isMut: false;
-          isSigner: false;
-        },
+      "name": "claim",
+      "accounts": [
         {
-          name: 'tokenMint';
-          isMut: true;
-          isSigner: false;
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'pTokenMint';
-          isMut: true;
-          isSigner: false;
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'pTokenFrom';
-          isMut: true;
-          isSigner: false;
+          "name": "authority",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'userAuthority';
-          isMut: false;
-          isSigner: true;
+          "name": "tokenMint",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'tokenVault';
-          isMut: true;
-          isSigner: false;
+          "name": "userInfo",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'authority';
-          isMut: false;
-          isSigner: false;
+          "name": "userOwner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'locker';
-          isMut: true;
-          isSigner: false;
+          "name": "destination",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'escrow';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'lockedTokens';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'lockerProgram';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'tokenProgram';
-          isMut: false;
-          isSigner: false;
-        }
-      ];
-      args: [
-        {
-          name: 'amount';
-          type: 'u64';
-        },
-        {
-          name: 'duration';
-          type: 'i64';
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
+      ],
+      "args": []
     },
     {
-      name: 'stakeV2';
-      accounts: [
+      "name": "stake",
+      "accounts": [
         {
-          name: 'poolInfo';
-          isMut: false;
-          isSigner: false;
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenMint';
-          isMut: true;
-          isSigner: false;
+          "name": "tokenMint",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'pTokenMint';
-          isMut: true;
-          isSigner: false;
+          "name": "pTokenMint",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'pTokenFrom';
-          isMut: true;
-          isSigner: false;
+          "name": "pTokenFrom",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'userAuthority';
-          isMut: false;
-          isSigner: true;
+          "name": "userAuthority",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'tokenVault';
-          isMut: true;
-          isSigner: false;
+          "name": "tokenVault",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'authority';
-          isMut: false;
-          isSigner: false;
+          "name": "authority",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'locker';
-          isMut: true;
-          isSigner: false;
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'escrow';
-          isMut: true;
-          isSigner: false;
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'lockedTokens';
-          isMut: true;
-          isSigner: false;
+          "name": "lockedTokens",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'lockerProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "lockerProgram",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
-      args: [
+      ],
+      "args": [
         {
-          name: 'amount';
-          type: 'u64';
+          "name": "amount",
+          "type": "u64"
         },
         {
-          name: 'duration';
-          type: 'i64';
+          "name": "duration",
+          "type": "i64"
         }
-      ];
+      ]
     }
-  ];
-  accounts: [
+  ],
+  "accounts": [
     {
-      name: 'poolInfo';
-      type: {
-        kind: 'struct';
-        fields: [
+      "name": "poolInfo",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'version';
-            type: 'u8';
+            "name": "version",
+            "type": "u8"
           },
           {
-            name: 'pTokenMint';
-            type: 'publicKey';
+            "name": "pTokenMint",
+            "type": "publicKey"
           },
           {
-            name: 'tokenMint';
-            type: 'publicKey';
+            "name": "tokenMint",
+            "type": "publicKey"
           },
           {
-            name: 'owner';
-            type: 'publicKey';
+            "name": "owner",
+            "type": "publicKey"
           },
           {
-            name: 'bump';
-            type: 'u8';
+            "name": "bump",
+            "type": "u8"
           },
           {
-            name: 'params';
-            type: {
-              defined: 'PoolParams';
-            };
+            "name": "params",
+            "type": {
+              "defined": "PoolParams"
+            }
           }
-        ];
-      };
+        ]
+      }
     },
     {
-      name: 'poolUser';
-      type: {
-        kind: 'struct';
-        fields: [
+      "name": "poolUser",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'poolInfo';
-            type: 'publicKey';
+            "name": "poolInfo",
+            "type": "publicKey"
           },
           {
-            name: 'owner';
-            type: 'publicKey';
+            "name": "owner",
+            "type": "publicKey"
           },
           {
-            name: 'depositAmount';
-            type: 'u64';
+            "name": "depositAmount",
+            "type": "u64"
           },
           {
-            name: 'claimedAmount';
-            type: 'u64';
+            "name": "claimedAmount",
+            "type": "u64"
           },
           {
-            name: 'depositedAt';
-            type: 'i64';
+            "name": "depositedAt",
+            "type": "i64"
           },
           {
-            name: 'count';
-            type: 'u8';
+            "name": "count",
+            "type": "u8"
           }
-        ];
-      };
+        ]
+      }
     }
-  ];
-  types: [
+  ],
+  "types": [
     {
-      name: 'PoolParams';
-      type: {
-        kind: 'struct';
-        fields: [
+      "name": "PoolParams",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'startsAt';
-            type: 'i64';
+            "name": "startsAt",
+            "type": "i64"
           },
           {
-            name: 'claimPeriodUnit';
-            type: 'i64';
+            "name": "claimPeriodUnit",
+            "type": "i64"
           },
           {
-            name: 'maxClaimCount';
-            type: 'u8';
+            "name": "maxClaimCount",
+            "type": "u8"
           }
-        ];
-      };
+        ]
+      }
     }
-  ];
-  errors: [
+  ],
+  "errors": [
     {
-      code: 6000;
-      name: 'InvalidParam';
-      msg: 'Invalid params';
+      "code": 6000,
+      "name": "InvalidParam",
+      "msg": "Invalid params"
     },
     {
-      code: 6001;
-      name: 'StartTimeFreezed';
-      msg: "Started time can't be modified";
+      "code": 6001,
+      "name": "StartTimeFreezed",
+      "msg": "Started time can't be modified"
     },
     {
-      code: 6002;
-      name: 'InsufficientFunds';
-      msg: 'Insufficient funds';
+      "code": 6002,
+      "name": "InsufficientFunds",
+      "msg": "Insufficient funds"
     },
     {
-      code: 6003;
-      name: 'NotClaimable';
-      msg: 'Not claimable';
+      "code": 6003,
+      "name": "NotClaimable",
+      "msg": "Not claimable"
     },
     {
-      code: 6004;
-      name: 'MathOverflow';
-      msg: 'Math overflow';
+      "code": 6004,
+      "name": "MathOverflow",
+      "msg": "Math overflow"
     },
     {
-      code: 6005;
-      name: 'Uninitialized';
-      msg: 'Pool is not initialized';
+      "code": 6005,
+      "name": "Uninitialized",
+      "msg": "Pool is not initialized"
     },
     {
-      code: 6006;
-      name: 'AnchorSerializationError';
-      msg: 'Anchor serialization error';
+      "code": 6006,
+      "name": "AnchorSerializationError",
+      "msg": "Anchor serialization error"
     }
-  ];
+  ]
 };
 
 export const IDL: Stake = {
-  version: '0.1.0',
-  name: 'stake',
-  instructions: [
+  "version": "0.1.0",
+  "name": "stake",
+  "instructions": [
     {
-      name: 'initialize',
-      accounts: [
+      "name": "initialize",
+      "accounts": [
         {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'owner',
-          isMut: false,
-          isSigner: true
+          "name": "owner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'tokenMint',
-          isMut: false,
-          isSigner: false
+          "name": "tokenMint",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'pTokenMint',
-          isMut: false,
-          isSigner: false
+          "name": "pTokenMint",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'poolInfo',
-          isMut: true,
-          isSigner: false
+          "name": "poolInfo",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'tokenVault',
-          isMut: true,
-          isSigner: false
+          "name": "tokenVault",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'authority',
-          isMut: false,
-          isSigner: false
+          "name": "authority",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'systemProgram',
-          isMut: false,
-          isSigner: false
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenProgram',
-          isMut: false,
-          isSigner: false
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'rent',
-          isMut: false,
-          isSigner: false
+          "name": "rent",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: [
+      "args": [
         {
-          name: 'params',
-          type: {
-            defined: 'PoolParams'
+          "name": "params",
+          "type": {
+            "defined": "PoolParams"
           }
         }
       ]
     },
     {
-      name: 'modifyParams',
-      accounts: [
+      "name": "modifyParams",
+      "accounts": [
         {
-          name: 'owner',
-          isMut: false,
-          isSigner: true
+          "name": "owner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'poolInfo',
-          isMut: true,
-          isSigner: false
+          "name": "poolInfo",
+          "isMut": true,
+          "isSigner": false
         }
       ],
-      args: [
+      "args": [
         {
-          name: 'params',
-          type: {
-            defined: 'PoolParams'
+          "name": "params",
+          "type": {
+            "defined": "PoolParams"
           }
         }
       ]
     },
     {
-      name: 'setMintAuthority',
-      accounts: [
+      "name": "setOwner",
+      "accounts": [
+        {
+          "name": "owner",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "poolInfo",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "newOwner",
+          "type": "publicKey"
+        }
+      ]
+    },
+    {
+      "name": "setMintAuthority",
+      "accounts": [
         {
-          name: 'owner',
-          isMut: false,
-          isSigner: true
+          "name": "owner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'poolInfo',
-          isMut: false,
-          isSigner: false
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenMint',
-          isMut: true,
-          isSigner: false
+          "name": "tokenMint",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'authority',
-          isMut: false,
-          isSigner: false
+          "name": "authority",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'originAuthority',
-          isMut: false,
-          isSigner: true
+          "name": "originAuthority",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'tokenProgram',
-          isMut: false,
-          isSigner: false
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: []
+      "args": []
     },
     {
-      name: 'reclaimMintAuthority',
-      accounts: [
+      "name": "reclaimMintAuthority",
+      "accounts": [
         {
-          name: 'owner',
-          isMut: false,
-          isSigner: true
+          "name": "owner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'poolInfo',
-          isMut: false,
-          isSigner: false
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenMint',
-          isMut: true,
-          isSigner: false
+          "name": "tokenMint",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'authority',
-          isMut: false,
-          isSigner: false
+          "name": "authority",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenProgram',
-          isMut: false,
-          isSigner: false
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: [
+      "args": [
         {
-          name: 'mintAuthority',
-          type: 'publicKey'
+          "name": "mintAuthority",
+          "type": "publicKey"
         }
       ]
     },
     {
-      name: 'initializeUser',
-      accounts: [
+      "name": "initializeUser",
+      "accounts": [
         {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'poolInfo',
-          isMut: false,
-          isSigner: false
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'userInfo',
-          isMut: true,
-          isSigner: false
+          "name": "userInfo",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'userOwner',
-          isMut: false,
-          isSigner: true
+          "name": "userOwner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'systemProgram',
-          isMut: false,
-          isSigner: false
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: []
+      "args": []
     },
     {
-      name: 'deposit',
-      accounts: [
+      "name": "deposit",
+      "accounts": [
         {
-          name: 'poolInfo',
-          isMut: false,
-          isSigner: false
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'userInfo',
-          isMut: true,
-          isSigner: false
+          "name": "userInfo",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'userOwner',
-          isMut: false,
-          isSigner: true
+          "name": "userOwner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'pTokenMint',
-          isMut: true,
-          isSigner: false
+          "name": "pTokenMint",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'source',
-          isMut: true,
-          isSigner: false
+          "name": "source",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'userAuthority',
-          isMut: false,
-          isSigner: true
+          "name": "userAuthority",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'tokenProgram',
-          isMut: false,
-          isSigner: false
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: [
+      "args": [
         {
-          name: 'amount',
-          type: 'u64'
+          "name": "amount",
+          "type": "u64"
         }
       ]
     },
     {
-      name: 'claim',
-      accounts: [
+      "name": "claim",
+      "accounts": [
         {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'poolInfo',
-          isMut: false,
-          isSigner: false
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'authority',
-          isMut: false,
-          isSigner: false
+          "name": "authority",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenMint',
-          isMut: true,
-          isSigner: false
+          "name": "tokenMint",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'userInfo',
-          isMut: true,
-          isSigner: false
+          "name": "userInfo",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'userOwner',
-          isMut: false,
-          isSigner: true
+          "name": "userOwner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'destination',
-          isMut: true,
-          isSigner: false
+          "name": "destination",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'tokenProgram',
-          isMut: false,
-          isSigner: false
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: []
-    },
-    {
-      name: 'stake',
-      accounts: [
-        {
-          name: 'poolInfo',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'tokenMint',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'pTokenMint',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'pTokenFrom',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'userAuthority',
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: 'tokenVault',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'authority',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'locker',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'escrow',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'lockedTokens',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'lockerProgram',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'tokenProgram',
-          isMut: false,
-          isSigner: false
-        }
-      ],
-      args: [
-        {
-          name: 'amount',
-          type: 'u64'
-        },
-        {
-          name: 'duration',
-          type: 'i64'
-        }
-      ]
+      "args": []
     },
     {
-      name: 'stakeV2',
-      accounts: [
+      "name": "stake",
+      "accounts": [
         {
-          name: 'poolInfo',
-          isMut: false,
-          isSigner: false
+          "name": "poolInfo",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenMint',
-          isMut: true,
-          isSigner: false
+          "name": "tokenMint",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'pTokenMint',
-          isMut: true,
-          isSigner: false
+          "name": "pTokenMint",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'pTokenFrom',
-          isMut: true,
-          isSigner: false
+          "name": "pTokenFrom",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'userAuthority',
-          isMut: false,
-          isSigner: true
+          "name": "userAuthority",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'tokenVault',
-          isMut: true,
-          isSigner: false
+          "name": "tokenVault",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'authority',
-          isMut: false,
-          isSigner: false
+          "name": "authority",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'locker',
-          isMut: true,
-          isSigner: false
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'escrow',
-          isMut: true,
-          isSigner: false
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'lockedTokens',
-          isMut: true,
-          isSigner: false
+          "name": "lockedTokens",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'lockerProgram',
-          isMut: false,
-          isSigner: false
+          "name": "lockerProgram",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenProgram',
-          isMut: false,
-          isSigner: false
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: [
+      "args": [
         {
-          name: 'amount',
-          type: 'u64'
+          "name": "amount",
+          "type": "u64"
         },
         {
-          name: 'duration',
-          type: 'i64'
+          "name": "duration",
+          "type": "i64"
         }
       ]
     }
   ],
-  accounts: [
+  "accounts": [
     {
-      name: 'poolInfo',
-      type: {
-        kind: 'struct',
-        fields: [
+      "name": "poolInfo",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'version',
-            type: 'u8'
+            "name": "version",
+            "type": "u8"
           },
           {
-            name: 'pTokenMint',
-            type: 'publicKey'
+            "name": "pTokenMint",
+            "type": "publicKey"
           },
           {
-            name: 'tokenMint',
-            type: 'publicKey'
+            "name": "tokenMint",
+            "type": "publicKey"
           },
           {
-            name: 'owner',
-            type: 'publicKey'
+            "name": "owner",
+            "type": "publicKey"
           },
           {
-            name: 'bump',
-            type: 'u8'
+            "name": "bump",
+            "type": "u8"
           },
           {
-            name: 'params',
-            type: {
-              defined: 'PoolParams'
+            "name": "params",
+            "type": {
+              "defined": "PoolParams"
             }
           }
         ]
       }
     },
     {
-      name: 'poolUser',
-      type: {
-        kind: 'struct',
-        fields: [
+      "name": "poolUser",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'poolInfo',
-            type: 'publicKey'
+            "name": "poolInfo",
+            "type": "publicKey"
           },
           {
-            name: 'owner',
-            type: 'publicKey'
+            "name": "owner",
+            "type": "publicKey"
           },
           {
-            name: 'depositAmount',
-            type: 'u64'
+            "name": "depositAmount",
+            "type": "u64"
           },
           {
-            name: 'claimedAmount',
-            type: 'u64'
+            "name": "claimedAmount",
+            "type": "u64"
           },
           {
-            name: 'depositedAt',
-            type: 'i64'
+            "name": "depositedAt",
+            "type": "i64"
           },
           {
-            name: 'count',
-            type: 'u8'
+            "name": "count",
+            "type": "u8"
           }
         ]
       }
     }
   ],
-  types: [
+  "types": [
     {
-      name: 'PoolParams',
-      type: {
-        kind: 'struct',
-        fields: [
+      "name": "PoolParams",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'startsAt',
-            type: 'i64'
+            "name": "startsAt",
+            "type": "i64"
           },
           {
-            name: 'claimPeriodUnit',
-            type: 'i64'
+            "name": "claimPeriodUnit",
+            "type": "i64"
           },
           {
-            name: 'maxClaimCount',
-            type: 'u8'
+            "name": "maxClaimCount",
+            "type": "u8"
           }
         ]
       }
     }
   ],
-  errors: [
+  "errors": [
     {
-      code: 6000,
-      name: 'InvalidParam',
-      msg: 'Invalid params'
+      "code": 6000,
+      "name": "InvalidParam",
+      "msg": "Invalid params"
     },
     {
-      code: 6001,
-      name: 'StartTimeFreezed',
-      msg: "Started time can't be modified"
+      "code": 6001,
+      "name": "StartTimeFreezed",
+      "msg": "Started time can't be modified"
     },
     {
-      code: 6002,
-      name: 'InsufficientFunds',
-      msg: 'Insufficient funds'
+      "code": 6002,
+      "name": "InsufficientFunds",
+      "msg": "Insufficient funds"
     },
     {
-      code: 6003,
-      name: 'NotClaimable',
-      msg: 'Not claimable'
+      "code": 6003,
+      "name": "NotClaimable",
+      "msg": "Not claimable"
     },
     {
-      code: 6004,
-      name: 'MathOverflow',
-      msg: 'Math overflow'
+      "code": 6004,
+      "name": "MathOverflow",
+      "msg": "Math overflow"
     },
     {
-      code: 6005,
-      name: 'Uninitialized',
-      msg: 'Pool is not initialized'
+      "code": 6005,
+      "name": "Uninitialized",
+      "msg": "Pool is not initialized"
     },
     {
-      code: 6006,
-      name: 'AnchorSerializationError',
-      msg: 'Anchor serialization error'
+      "code": 6006,
+      "name": "AnchorSerializationError",
+      "msg": "Anchor serialization error"
     }
   ]
 };
diff --git a/helpers/types/ve_honey.ts b/helpers/types/ve_honey.ts
index 9248ea3c..ef8633a5 100644
--- a/helpers/types/ve_honey.ts
+++ b/helpers/types/ve_honey.ts
@@ -1,2567 +1,1583 @@
 import { generateErrorMap } from '@saberhq/anchor-contrib';
 
 export type VeHoney = {
-  version: '0.1.0';
-  name: 've_honey';
-  instructions: [
+  "version": "0.1.0",
+  "name": "ve_honey",
+  "instructions": [
     {
-      name: 'initLocker';
-      accounts: [
+      "name": "initLocker",
+      "accounts": [
         {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'base';
-          isMut: false;
-          isSigner: true;
+          "name": "base",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'locker';
-          isMut: true;
-          isSigner: false;
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'tokenMint';
-          isMut: false;
-          isSigner: false;
+          "name": "tokenMint",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'systemProgram';
-          isMut: false;
-          isSigner: false;
-        }
-      ];
-      args: [
-        {
-          name: 'admin';
-          type: 'publicKey';
-        },
-        {
-          name: 'params';
-          type: {
-            defined: 'LockerParams';
-          };
-        }
-      ];
-    },
-    {
-      name: 'setLockerParams';
-      accounts: [
-        {
-          name: 'admin';
-          isMut: false;
-          isSigner: true;
-        },
-        {
-          name: 'locker';
-          isMut: true;
-          isSigner: false;
-        }
-      ];
-      args: [
-        {
-          name: 'params';
-          type: {
-            defined: 'LockerParams';
-          };
-        }
-      ];
-    },
-    {
-      name: 'initEscrow';
-      accounts: [
-        {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
-        },
-        {
-          name: 'locker';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'escrow';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'escrowOwner';
-          isMut: false;
-          isSigner: false;
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'systemProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
-      args: [];
-    },
-    {
-      name: 'approveProgramLockPrivilege';
-      accounts: [
-        {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
-        },
-        {
-          name: 'locker';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'lockerAdmin';
-          isMut: false;
-          isSigner: true;
-        },
-        {
-          name: 'whitelistEntry';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'executableId';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'whitelistedOwner';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'systemProgram';
-          isMut: false;
-          isSigner: false;
-        }
-      ];
-      args: [];
-    },
-    {
-      name: 'revokeProgramLockPrivilege';
-      accounts: [
-        {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
-        },
-        {
-          name: 'locker';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'lockerAdmin';
-          isMut: false;
-          isSigner: true;
-        },
-        {
-          name: 'whitelistEntry';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'executableId';
-          isMut: false;
-          isSigner: false;
-        }
-      ];
-      args: [];
-    },
-    {
-      name: 'lock';
-      accounts: [
-        {
-          name: 'locker';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'escrow';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'lockedTokens';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'escrowOwner';
-          isMut: false;
-          isSigner: true;
-        },
-        {
-          name: 'sourceTokens';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'sourceTokensAuthority';
-          isMut: false;
-          isSigner: true;
-        },
-        {
-          name: 'tokenProgram';
-          isMut: false;
-          isSigner: false;
-        }
-      ];
-      args: [
-        {
-          name: 'amount';
-          type: 'u64';
-        },
+      ],
+      "args": [
         {
-          name: 'duration';
-          type: 'i64';
+          "name": "params",
+          "type": {
+            "defined": "LockerParams"
+          }
         }
-      ];
+      ]
     },
     {
-      name: 'exit';
-      accounts: [
+      "name": "initEscrow",
+      "accounts": [
         {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'locker';
-          isMut: true;
-          isSigner: false;
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'escrow';
-          isMut: true;
-          isSigner: false;
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'escrowOwner';
-          isMut: false;
-          isSigner: true;
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'lockedTokens';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'destinationTokens';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'tokenProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
-      args: [];
+      ],
+      "args": []
     },
     {
-      name: 'migrateLocker';
-      accounts: [
-        {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
-        },
-        {
-          name: 'base';
-          isMut: false;
-          isSigner: true;
-        },
-        {
-          name: 'locker';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'newBase';
-          isMut: false;
-          isSigner: true;
-        },
+      "name": "setLockerParams",
+      "accounts": [
         {
-          name: 'newLocker';
-          isMut: true;
-          isSigner: false;
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'governor';
-          isMut: false;
-          isSigner: false;
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'smartWallet';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'systemProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "smartWallet",
+          "isMut": false,
+          "isSigner": true
         }
-      ];
-      args: [
+      ],
+      "args": [
         {
-          name: 'proposalActivationMinVotes';
-          type: 'u64';
+          "name": "params",
+          "type": {
+            "defined": "LockerParams"
+          }
         }
-      ];
+      ]
     },
     {
-      name: 'migrateEscrow';
-      accounts: [
-        {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
-        },
-        {
-          name: 'lockerAdmin';
-          isMut: false;
-          isSigner: true;
-        },
-        {
-          name: 'oldLocker';
-          isMut: false;
-          isSigner: false;
-        },
+      "name": "approveProgramLockPrivilege",
+      "accounts": [
         {
-          name: 'newLocker';
-          isMut: false;
-          isSigner: false;
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'oldEscrow';
-          isMut: true;
-          isSigner: false;
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'newEscrow';
-          isMut: true;
-          isSigner: false;
+          "name": "whitelistEntry",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'oldLockedTokens';
-          isMut: true;
-          isSigner: false;
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'newLockedTokens';
-          isMut: true;
-          isSigner: false;
+          "name": "smartWallet",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'escrowOwner';
-          isMut: false;
-          isSigner: false;
+          "name": "executableId",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'systemProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "whitelistedOwner",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
-      args: [];
+      ],
+      "args": []
     },
     {
-      name: 'migrateWhitelist';
-      accounts: [
+      "name": "revokeProgramLockPrivilege",
+      "accounts": [
         {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'oldLocker';
-          isMut: false;
-          isSigner: false;
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'newLocker';
-          isMut: false;
-          isSigner: false;
+          "name": "whitelistEntry",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'lockerAdmin';
-          isMut: false;
-          isSigner: true;
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'whitelistEntry';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'newWhitelistEntry';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'systemProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "smartWallet",
+          "isMut": false,
+          "isSigner": true
         }
-      ];
-      args: [];
+      ],
+      "args": []
     },
     {
-      name: 'initLockerV2';
-      accounts: [
+      "name": "lock",
+      "accounts": [
         {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'base';
-          isMut: false;
-          isSigner: true;
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'locker';
-          isMut: true;
-          isSigner: false;
+          "name": "lockedTokens",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'tokenMint';
-          isMut: false;
-          isSigner: false;
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'governor';
-          isMut: false;
-          isSigner: false;
+          "name": "sourceTokens",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'systemProgram';
-          isMut: false;
-          isSigner: false;
-        }
-      ];
-      args: [
-        {
-          name: 'params';
-          type: {
-            defined: 'LockerParamsV2';
-          };
-        }
-      ];
-    },
-    {
-      name: 'initEscrowV2';
-      accounts: [
-        {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
-        },
-        {
-          name: 'locker';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'escrow';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'escrowOwner';
-          isMut: false;
-          isSigner: false;
+          "name": "sourceTokensAuthority",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'systemProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
-      args: [];
-    },
-    {
-      name: 'setLockerParamsV2';
-      accounts: [
-        {
-          name: 'locker';
-          isMut: true;
-          isSigner: false;
-        },
+      ],
+      "args": [
         {
-          name: 'governor';
-          isMut: false;
-          isSigner: false;
+          "name": "amount",
+          "type": "u64"
         },
         {
-          name: 'smartWallet';
-          isMut: false;
-          isSigner: true;
-        }
-      ];
-      args: [
-        {
-          name: 'params';
-          type: {
-            defined: 'LockerParamsV2';
-          };
+          "name": "duration",
+          "type": "i64"
         }
-      ];
+      ]
     },
     {
-      name: 'approveProgramLockPrivilegeV2';
-      accounts: [
+      "name": "exit",
+      "accounts": [
         {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'locker';
-          isMut: false;
-          isSigner: false;
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'whitelistEntry';
-          isMut: true;
-          isSigner: false;
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'governor';
-          isMut: false;
-          isSigner: false;
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'smartWallet';
-          isMut: false;
-          isSigner: true;
+          "name": "lockedTokens",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'executableId';
-          isMut: false;
-          isSigner: false;
+          "name": "destinationTokens",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'whitelistedOwner';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'systemProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
-      args: [];
-    },
-    {
-      name: 'revokeProgramLockPrivilegeV2';
-      accounts: [
-        {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
-        },
-        {
-          name: 'locker';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'whitelistEntry';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'governor';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'smartWallet';
-          isMut: false;
-          isSigner: true;
-        }
-      ];
-      args: [];
+      ],
+      "args": []
     },
     {
-      name: 'lockV2';
-      accounts: [
-        {
-          name: 'locker';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'escrow';
-          isMut: true;
-          isSigner: false;
-        },
+      "name": "activateProposal",
+      "accounts": [
         {
-          name: 'lockedTokens';
-          isMut: true;
-          isSigner: false;
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'escrowOwner';
-          isMut: false;
-          isSigner: true;
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'sourceTokens';
-          isMut: true;
-          isSigner: false;
+          "name": "proposal",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'sourceTokensAuthority';
-          isMut: false;
-          isSigner: true;
+          "name": "escrow",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenProgram';
-          isMut: false;
-          isSigner: false;
-        }
-      ];
-      args: [
-        {
-          name: 'amount';
-          type: 'u64';
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'duration';
-          type: 'i64';
+          "name": "governProgram",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
+      ],
+      "args": []
     },
     {
-      name: 'exitV2';
-      accounts: [
+      "name": "castVote",
+      "accounts": [
         {
-          name: 'payer';
-          isMut: true;
-          isSigner: true;
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'locker';
-          isMut: true;
-          isSigner: false;
+          "name": "escrow",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'escrow';
-          isMut: true;
-          isSigner: false;
+          "name": "voteDelegate",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'escrowOwner';
-          isMut: false;
-          isSigner: true;
+          "name": "proposal",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'lockedTokens';
-          isMut: true;
-          isSigner: false;
+          "name": "vote",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'destinationTokens';
-          isMut: true;
-          isSigner: false;
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "governProgram",
+          "isMut": false,
+          "isSigner": false
         }
-      ];
-      args: [];
-    },
-    {
-      name: 'activateProposal';
-      accounts: [
-        {
-          name: 'locker';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'governor';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'proposal';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'escrow';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'escrowOwner';
-          isMut: false;
-          isSigner: true;
-        },
+      ],
+      "args": [
         {
-          name: 'governProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "side",
+          "type": "u8"
         }
-      ];
-      args: [];
+      ]
     },
     {
-      name: 'castVote';
-      accounts: [
-        {
-          name: 'locker';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'escrow';
-          isMut: false;
-          isSigner: false;
-        },
+      "name": "setVoteDelegate",
+      "accounts": [
         {
-          name: 'voteDelegate';
-          isMut: false;
-          isSigner: true;
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'proposal';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'vote';
-          isMut: true;
-          isSigner: false;
-        },
-        {
-          name: 'governor';
-          isMut: false;
-          isSigner: false;
-        },
-        {
-          name: 'governProgram';
-          isMut: false;
-          isSigner: false;
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
         }
-      ];
-      args: [
+      ],
+      "args": [
         {
-          name: 'side';
-          type: 'u8';
+          "name": "newDelegate",
+          "type": "publicKey"
         }
-      ];
+      ]
     }
-  ];
-  accounts: [
-    {
-      name: 'escrow';
-      type: {
-        kind: 'struct';
-        fields: [
-          {
-            name: 'locker';
-            type: 'publicKey';
-          },
-          {
-            name: 'owner';
-            type: 'publicKey';
-          },
-          {
-            name: 'bump';
-            type: 'u8';
-          },
-          {
-            name: 'tokens';
-            type: 'publicKey';
-          },
-          {
-            name: 'amount';
-            type: 'u64';
-          },
-          {
-            name: 'escrowStartedAt';
-            type: 'i64';
-          },
-          {
-            name: 'escrowEndsAt';
-            type: 'i64';
-          }
-        ];
-      };
-    },
+  ],
+  "accounts": [
     {
-      name: 'escrowV2';
-      type: {
-        kind: 'struct';
-        fields: [
+      "name": "escrow",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'locker';
-            type: 'publicKey';
+            "name": "locker",
+            "type": "publicKey"
           },
           {
-            name: 'owner';
-            type: 'publicKey';
+            "name": "owner",
+            "type": "publicKey"
           },
           {
-            name: 'bump';
-            type: 'u8';
+            "name": "bump",
+            "type": "u8"
           },
           {
-            name: 'tokens';
-            type: 'publicKey';
+            "name": "tokens",
+            "type": "publicKey"
           },
           {
-            name: 'amount';
-            type: 'u64';
+            "name": "amount",
+            "type": "u64"
           },
           {
-            name: 'escrowStartedAt';
-            type: 'i64';
+            "name": "escrowStartedAt",
+            "type": "i64"
           },
           {
-            name: 'escrowEndsAt';
-            type: 'i64';
+            "name": "escrowEndsAt",
+            "type": "i64"
           },
           {
-            name: 'voteDelegate';
-            type: 'publicKey';
+            "name": "voteDelegate",
+            "type": "publicKey"
           }
-        ];
-      };
-    },
-    {
-      name: 'locker';
-      type: {
-        kind: 'struct';
-        fields: [
-          {
-            name: 'base';
-            type: 'publicKey';
-          },
-          {
-            name: 'bump';
-            type: 'u8';
-          },
-          {
-            name: 'tokenMint';
-            type: 'publicKey';
-          },
-          {
-            name: 'lockedSupply';
-            type: 'u64';
-          },
-          {
-            name: 'admin';
-            type: 'publicKey';
-          },
-          {
-            name: 'params';
-            type: {
-              defined: 'LockerParams';
-            };
-          }
-        ];
-      };
+        ]
+      }
     },
     {
-      name: 'lockerV2';
-      type: {
-        kind: 'struct';
-        fields: [
+      "name": "locker",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'base';
-            type: 'publicKey';
+            "name": "base",
+            "type": "publicKey"
           },
           {
-            name: 'bump';
-            type: 'u8';
+            "name": "bump",
+            "type": "u8"
           },
           {
-            name: 'tokenMint';
-            type: 'publicKey';
+            "name": "tokenMint",
+            "type": "publicKey"
           },
           {
-            name: 'lockedSupply';
-            type: 'u64';
+            "name": "lockedSupply",
+            "type": "u64"
           },
           {
-            name: 'governor';
-            type: 'publicKey';
+            "name": "governor",
+            "type": "publicKey"
           },
           {
-            name: 'params';
-            type: {
-              defined: 'LockerParamsV2';
-            };
+            "name": "params",
+            "type": {
+              "defined": "LockerParams"
+            }
           }
-        ];
-      };
+        ]
+      }
     },
     {
-      name: 'whitelistEntry';
-      type: {
-        kind: 'struct';
-        fields: [
+      "name": "whitelistEntry",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'locker';
-            type: 'publicKey';
+            "name": "locker",
+            "type": "publicKey"
           },
           {
-            name: 'bump';
-            type: 'u8';
+            "name": "bump",
+            "type": "u8"
           },
           {
-            name: 'programId';
-            type: 'publicKey';
+            "name": "programId",
+            "type": "publicKey"
           },
           {
-            name: 'owner';
-            type: 'publicKey';
+            "name": "owner",
+            "type": "publicKey"
           }
-        ];
-      };
+        ]
+      }
     }
-  ];
-  types: [
-    {
-      name: 'LockerParams';
-      type: {
-        kind: 'struct';
-        fields: [
-          {
-            name: 'minStakeDuration';
-            type: 'u64';
-          },
-          {
-            name: 'maxStakeDuration';
-            type: 'u64';
-          },
-          {
-            name: 'whitelistEnabled';
-            type: 'bool';
-          },
-          {
-            name: 'multiplier';
-            type: 'u8';
-          }
-        ];
-      };
-    },
+  ],
+  "types": [
     {
-      name: 'LockerParamsV2';
-      type: {
-        kind: 'struct';
-        fields: [
+      "name": "LockerParams",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'minStakeDuration';
-            type: 'u64';
+            "name": "minStakeDuration",
+            "type": "u64"
           },
           {
-            name: 'maxStakeDuration';
-            type: 'u64';
+            "name": "maxStakeDuration",
+            "type": "u64"
           },
           {
-            name: 'proposalActivationMinVotes';
-            type: 'u64';
+            "name": "whitelistEnabled",
+            "type": "bool"
           },
           {
-            name: 'whitelistEnabled';
-            type: 'bool';
+            "name": "multiplier",
+            "type": "u8"
           },
           {
-            name: 'multiplier';
-            type: 'u8';
+            "name": "proposalActivationMinVotes",
+            "type": "u64"
           }
-        ];
-      };
+        ]
+      }
     }
-  ];
-  events: [
+  ],
+  "events": [
     {
-      name: 'ExitEscrowEvent';
-      fields: [
+      "name": "ExitEscrowEvent",
+      "fields": [
         {
-          name: 'escrowOwner';
-          type: 'publicKey';
-          index: false;
+          "name": "escrowOwner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'timestamp';
-          type: 'i64';
-          index: false;
+          "name": "timestamp",
+          "type": "i64",
+          "index": false
         },
         {
-          name: 'lockedSupply';
-          type: 'u64';
-          index: false;
+          "name": "lockedSupply",
+          "type": "u64",
+          "index": false
         },
         {
-          name: 'releasedAmount';
-          type: 'u64';
-          index: false;
+          "name": "releasedAmount",
+          "type": "u64",
+          "index": false
         }
-      ];
+      ]
     },
     {
-      name: 'InitEscrowEvent';
-      fields: [
+      "name": "InitEscrowEvent",
+      "fields": [
         {
-          name: 'escrow';
-          type: 'publicKey';
-          index: false;
+          "name": "escrow",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'escrowOwner';
-          type: 'publicKey';
-          index: false;
+          "name": "escrowOwner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'timestamp';
-          type: 'i64';
-          index: false;
+          "name": "timestamp",
+          "type": "i64",
+          "index": false
         }
-      ];
+      ]
     },
     {
-      name: 'InitLockerEvent';
-      fields: [
+      "name": "InitLockerEvent",
+      "fields": [
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'tokenMint';
-          type: 'publicKey';
-          index: false;
+          "name": "tokenMint",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'admin';
-          type: 'publicKey';
-          index: false;
+          "name": "governor",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'params';
-          type: {
-            defined: 'LockerParams';
-          };
-          index: false;
+          "name": "params",
+          "type": {
+            "defined": "LockerParams"
+          },
+          "index": false
         }
-      ];
+      ]
     },
     {
-      name: 'InitLockerV2Event';
-      fields: [
+      "name": "LockEvent",
+      "fields": [
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'tokenMint';
-          type: 'publicKey';
-          index: false;
+          "name": "escrowOwner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'governor';
-          type: 'publicKey';
-          index: false;
+          "name": "tokenMint",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'params';
-          type: {
-            defined: 'LockerParamsV2';
-          };
-          index: false;
-        }
-      ];
-    },
-    {
-      name: 'LockEvent';
-      fields: [
-        {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          "name": "amount",
+          "type": "u64",
+          "index": false
         },
         {
-          name: 'escrowOwner';
-          type: 'publicKey';
-          index: false;
+          "name": "lockerSupply",
+          "type": "u64",
+          "index": false
         },
         {
-          name: 'tokenMint';
-          type: 'publicKey';
-          index: false;
+          "name": "duration",
+          "type": "i64",
+          "index": false
         },
         {
-          name: 'amount';
-          type: 'u64';
-          index: false;
+          "name": "prevEscrowEndsAt",
+          "type": "i64",
+          "index": false
         },
         {
-          name: 'lockerSupply';
-          type: 'u64';
-          index: false;
+          "name": "nextEscrowEndsAt",
+          "type": "i64",
+          "index": false
         },
         {
-          name: 'duration';
-          type: 'i64';
-          index: false;
-        },
+          "name": "nextEscrowStartedAt",
+          "type": "i64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "SetVoteDelegateEvent",
+      "fields": [
         {
-          name: 'prevEscrowEndsAt';
-          type: 'i64';
-          index: false;
+          "name": "escrowOwner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'nextEscrowEndsAt';
-          type: 'i64';
-          index: false;
+          "name": "oldDelegate",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'nextEscrowStartedAt';
-          type: 'i64';
-          index: false;
+          "name": "newDelegate",
+          "type": "publicKey",
+          "index": false
         }
-      ];
+      ]
     },
     {
-      name: 'ApproveLockPrivilegeEvent';
-      fields: [
+      "name": "ApproveLockPrivilegeEvent",
+      "fields": [
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'programId';
-          type: 'publicKey';
-          index: false;
+          "name": "programId",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'owner';
-          type: 'publicKey';
-          index: false;
+          "name": "owner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'timestamp';
-          type: 'i64';
-          index: false;
+          "name": "timestamp",
+          "type": "i64",
+          "index": false
         }
-      ];
+      ]
     },
     {
-      name: 'RevokeLockPrivilegeEvent';
-      fields: [
+      "name": "RevokeLockPrivilegeEvent",
+      "fields": [
         {
-          name: 'locker';
-          type: 'publicKey';
-          index: false;
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'programId';
-          type: 'publicKey';
-          index: false;
+          "name": "programId",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'timestamp';
-          type: 'i64';
-          index: false;
+          "name": "timestamp",
+          "type": "i64",
+          "index": false
         }
-      ];
+      ]
     }
-  ];
-  errors: [
+  ],
+  "errors": [
     {
-      code: 6000;
-      name: 'EscrowNotEnded';
-      msg: 'Escrow has not ended.';
+      "code": 6000,
+      "name": "EscrowNotEnded",
+      "msg": "Escrow has not ended."
     },
     {
-      code: 6001;
-      name: 'InvalidLockerAdmin';
-      msg: 'Invalid locker admin';
+      "code": 6001,
+      "name": "InvalidLockerAdmin",
+      "msg": "Invalid locker admin"
     },
     {
-      code: 6002;
-      name: 'LockupDurationTooShort';
-      msg: 'Lockup duration must at least be the min stake duration.';
+      "code": 6002,
+      "name": "LockupDurationTooShort",
+      "msg": "Lockup duration must at least be the min stake duration."
     },
     {
-      code: 6003;
-      name: 'LockupDurationTooLong';
-      msg: 'Lockup duration must at most be the max stake duration.';
+      "code": 6003,
+      "name": "LockupDurationTooLong",
+      "msg": "Lockup duration must at most be the max stake duration."
     },
     {
-      code: 6004;
-      name: 'RefreshCannotShorten';
-      msg: 'A voting escrow refresh cannot shorten the escrow time remaining.';
+      "code": 6004,
+      "name": "RefreshCannotShorten",
+      "msg": "A voting escrow refresh cannot shorten the escrow time remaining."
     },
     {
-      code: 6005;
-      name: 'MustProvideWhitelist';
-      msg: 'Program whitelist enabled; please provide whitelist entry and instructions sysvar';
+      "code": 6005,
+      "name": "MustProvideWhitelist",
+      "msg": "Program whitelist enabled; please provide whitelist entry and instructions sysvar"
     },
     {
-      code: 6006;
-      name: 'ProgramNotWhitelisted';
-      msg: 'CPI caller not whitelisted to invoke lock instruction.';
+      "code": 6006,
+      "name": "ProgramNotWhitelisted",
+      "msg": "CPI caller not whitelisted to invoke lock instruction."
     },
     {
-      code: 6007;
-      name: 'EscrowOwnerNotWhitelisted';
-      msg: 'CPI caller not whitelisted for escrow owner to invoke lock instruction.';
+      "code": 6007,
+      "name": "EscrowOwnerNotWhitelisted",
+      "msg": "CPI caller not whitelisted for escrow owner to invoke lock instruction."
     },
     {
-      code: 6008;
-      name: 'EscrowExpired';
-      msg: 'Escrow was already expired.';
+      "code": 6008,
+      "name": "EscrowExpired",
+      "msg": "Escrow was already expired."
     },
     {
-      code: 6009;
-      name: 'LockedSupplyMismatch';
-      msg: 'Token lock failed, locked supply mismatches the exact amount.';
+      "code": 6009,
+      "name": "LockedSupplyMismatch",
+      "msg": "Token lock failed, locked supply mismatches the exact amount."
     },
     {
-      code: 6010;
-      name: 'EscrowInUse';
-      msg: 'The escrow has already locked.';
+      "code": 6010,
+      "name": "EscrowInUse",
+      "msg": "The escrow has already locked."
     },
     {
-      code: 6011;
-      name: 'EscrowNoBalance';
-      msg: "The escrow doesn't have balance";
+      "code": 6011,
+      "name": "EscrowNoBalance",
+      "msg": "The escrow doesn't have balance"
     },
     {
-      code: 6012;
-      name: 'ProposalMustBeActive';
-      msg: 'The proposal must be active';
+      "code": 6012,
+      "name": "ProposalMustBeActive",
+      "msg": "The proposal must be active"
     },
     {
-      code: 6013;
-      name: 'GovernorMismatch';
-      msg: 'Governor mismatch';
+      "code": 6013,
+      "name": "GovernorMismatch",
+      "msg": "Governor mismatch"
     },
     {
-      code: 6014;
-      name: 'ProgramIdMustBeExecutable';
-      msg: 'Program id must be executable';
+      "code": 6014,
+      "name": "ProgramIdMustBeExecutable",
+      "msg": "Program id must be executable"
     },
     {
-      code: 6015;
-      name: 'InsufficientVotingPower';
-      msg: 'Insufficient voting power to activate a proposal';
+      "code": 6015,
+      "name": "InsufficientVotingPower",
+      "msg": "Insufficient voting power to activate a proposal"
     }
-  ];
+  ]
 };
 
 export const IDL: VeHoney = {
-  version: '0.1.0',
-  name: 've_honey',
-  instructions: [
+  "version": "0.1.0",
+  "name": "ve_honey",
+  "instructions": [
     {
-      name: 'initLocker',
-      accounts: [
+      "name": "initLocker",
+      "accounts": [
         {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'base',
-          isMut: false,
-          isSigner: true
+          "name": "base",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'locker',
-          isMut: true,
-          isSigner: false
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'tokenMint',
-          isMut: false,
-          isSigner: false
+          "name": "tokenMint",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'systemProgram',
-          isMut: false,
-          isSigner: false
-        }
-      ],
-      args: [
-        {
-          name: 'admin',
-          type: 'publicKey'
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'params',
-          type: {
-            defined: 'LockerParams'
-          }
-        }
-      ]
-    },
-    {
-      name: 'setLockerParams',
-      accounts: [
-        {
-          name: 'admin',
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: 'locker',
-          isMut: true,
-          isSigner: false
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: [
+      "args": [
         {
-          name: 'params',
-          type: {
-            defined: 'LockerParams'
+          "name": "params",
+          "type": {
+            "defined": "LockerParams"
           }
         }
       ]
     },
     {
-      name: 'initEscrow',
-      accounts: [
-        {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
-        },
-        {
-          name: 'locker',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'escrow',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'escrowOwner',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'systemProgram',
-          isMut: false,
-          isSigner: false
-        }
-      ],
-      args: []
-    },
-    {
-      name: 'approveProgramLockPrivilege',
-      accounts: [
-        {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
-        },
-        {
-          name: 'locker',
-          isMut: false,
-          isSigner: false
-        },
+      "name": "initEscrow",
+      "accounts": [
         {
-          name: 'lockerAdmin',
-          isMut: false,
-          isSigner: true
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'whitelistEntry',
-          isMut: true,
-          isSigner: false
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'executableId',
-          isMut: false,
-          isSigner: false
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'whitelistedOwner',
-          isMut: false,
-          isSigner: false
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'systemProgram',
-          isMut: false,
-          isSigner: false
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: []
+      "args": []
     },
     {
-      name: 'revokeProgramLockPrivilege',
-      accounts: [
-        {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
-        },
+      "name": "setLockerParams",
+      "accounts": [
         {
-          name: 'locker',
-          isMut: false,
-          isSigner: false
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'lockerAdmin',
-          isMut: false,
-          isSigner: true
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'whitelistEntry',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'executableId',
-          isMut: false,
-          isSigner: false
+          "name": "smartWallet",
+          "isMut": false,
+          "isSigner": true
         }
       ],
-      args: []
-    },
-    {
-      name: 'lock',
-      accounts: [
-        {
-          name: 'locker',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'escrow',
-          isMut: true,
-          isSigner: false
-        },
+      "args": [
         {
-          name: 'lockedTokens',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'escrowOwner',
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: 'sourceTokens',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'sourceTokensAuthority',
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: 'tokenProgram',
-          isMut: false,
-          isSigner: false
-        }
-      ],
-      args: [
-        {
-          name: 'amount',
-          type: 'u64'
-        },
-        {
-          name: 'duration',
-          type: 'i64'
+          "name": "params",
+          "type": {
+            "defined": "LockerParams"
+          }
         }
       ]
     },
     {
-      name: 'exit',
-      accounts: [
+      "name": "approveProgramLockPrivilege",
+      "accounts": [
         {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'locker',
-          isMut: true,
-          isSigner: false
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'escrow',
-          isMut: true,
-          isSigner: false
+          "name": "whitelistEntry",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'escrowOwner',
-          isMut: false,
-          isSigner: true
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'lockedTokens',
-          isMut: true,
-          isSigner: false
+          "name": "smartWallet",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'destinationTokens',
-          isMut: true,
-          isSigner: false
+          "name": "executableId",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenProgram',
-          isMut: false,
-          isSigner: false
-        }
-      ],
-      args: []
-    },
-    {
-      name: 'migrateLocker',
-      accounts: [
-        {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
-        },
-        {
-          name: 'base',
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: 'locker',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'newBase',
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: 'newLocker',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'governor',
-          isMut: false,
-          isSigner: false
+          "name": "whitelistedOwner",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'smartWallet',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'systemProgram',
-          isMut: false,
-          isSigner: false
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: [
-        {
-          name: 'proposalActivationMinVotes',
-          type: 'u64'
-        }
-      ]
+      "args": []
     },
     {
-      name: 'migrateEscrow',
-      accounts: [
-        {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
-        },
-        {
-          name: 'lockerAdmin',
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: 'oldLocker',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'newLocker',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'oldEscrow',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'newEscrow',
-          isMut: true,
-          isSigner: false
-        },
+      "name": "revokeProgramLockPrivilege",
+      "accounts": [
         {
-          name: 'oldLockedTokens',
-          isMut: true,
-          isSigner: false
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'newLockedTokens',
-          isMut: true,
-          isSigner: false
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'escrowOwner',
-          isMut: false,
-          isSigner: false
+          "name": "whitelistEntry",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'systemProgram',
-          isMut: false,
-          isSigner: false
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'tokenProgram',
-          isMut: false,
-          isSigner: false
+          "name": "smartWallet",
+          "isMut": false,
+          "isSigner": true
         }
       ],
-      args: []
+      "args": []
     },
     {
-      name: 'migrateWhitelist',
-      accounts: [
+      "name": "lock",
+      "accounts": [
         {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'oldLocker',
-          isMut: false,
-          isSigner: false
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'newLocker',
-          isMut: false,
-          isSigner: false
+          "name": "lockedTokens",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'lockerAdmin',
-          isMut: false,
-          isSigner: true
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'whitelistEntry',
-          isMut: true,
-          isSigner: false
+          "name": "sourceTokens",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'newWhitelistEntry',
-          isMut: true,
-          isSigner: false
+          "name": "sourceTokensAuthority",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'systemProgram',
-          isMut: false,
-          isSigner: false
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: []
-    },
-    {
-      name: 'initLockerV2',
-      accounts: [
-        {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
-        },
+      "args": [
         {
-          name: 'base',
-          isMut: false,
-          isSigner: true
+          "name": "amount",
+          "type": "u64"
         },
         {
-          name: 'locker',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'tokenMint',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'governor',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'systemProgram',
-          isMut: false,
-          isSigner: false
-        }
-      ],
-      args: [
-        {
-          name: 'params',
-          type: {
-            defined: 'LockerParamsV2'
-          }
+          "name": "duration",
+          "type": "i64"
         }
       ]
     },
     {
-      name: 'initEscrowV2',
-      accounts: [
+      "name": "exit",
+      "accounts": [
         {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
         },
         {
-          name: 'locker',
-          isMut: false,
-          isSigner: false
+          "name": "locker",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'escrow',
-          isMut: true,
-          isSigner: false
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'escrowOwner',
-          isMut: false,
-          isSigner: false
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'systemProgram',
-          isMut: false,
-          isSigner: false
-        }
-      ],
-      args: []
-    },
-    {
-      name: 'setLockerParamsV2',
-      accounts: [
-        {
-          name: 'locker',
-          isMut: true,
-          isSigner: false
+          "name": "lockedTokens",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'governor',
-          isMut: false,
-          isSigner: false
+          "name": "destinationTokens",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'smartWallet',
-          isMut: false,
-          isSigner: true
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: [
-        {
-          name: 'params',
-          type: {
-            defined: 'LockerParamsV2'
-          }
-        }
-      ]
+      "args": []
     },
     {
-      name: 'approveProgramLockPrivilegeV2',
-      accounts: [
-        {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
-        },
-        {
-          name: 'locker',
-          isMut: false,
-          isSigner: false
-        },
+      "name": "activateProposal",
+      "accounts": [
         {
-          name: 'whitelistEntry',
-          isMut: true,
-          isSigner: false
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'governor',
-          isMut: false,
-          isSigner: false
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'smartWallet',
-          isMut: false,
-          isSigner: true
+          "name": "proposal",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'executableId',
-          isMut: false,
-          isSigner: false
+          "name": "escrow",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'whitelistedOwner',
-          isMut: false,
-          isSigner: false
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'systemProgram',
-          isMut: false,
-          isSigner: false
+          "name": "governProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: []
+      "args": []
     },
     {
-      name: 'revokeProgramLockPrivilegeV2',
-      accounts: [
-        {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
-        },
+      "name": "castVote",
+      "accounts": [
         {
-          name: 'locker',
-          isMut: false,
-          isSigner: false
+          "name": "locker",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'whitelistEntry',
-          isMut: true,
-          isSigner: false
+          "name": "escrow",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'governor',
-          isMut: false,
-          isSigner: false
+          "name": "voteDelegate",
+          "isMut": false,
+          "isSigner": true
         },
         {
-          name: 'smartWallet',
-          isMut: false,
-          isSigner: true
-        }
-      ],
-      args: []
-    },
-    {
-      name: 'lockV2',
-      accounts: [
-        {
-          name: 'locker',
-          isMut: true,
-          isSigner: false
+          "name": "proposal",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'escrow',
-          isMut: true,
-          isSigner: false
+          "name": "vote",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'lockedTokens',
-          isMut: true,
-          isSigner: false
+          "name": "governor",
+          "isMut": false,
+          "isSigner": false
         },
         {
-          name: 'escrowOwner',
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: 'sourceTokens',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'sourceTokensAuthority',
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: 'tokenProgram',
-          isMut: false,
-          isSigner: false
+          "name": "governProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
-      args: [
+      "args": [
         {
-          name: 'amount',
-          type: 'u64'
-        },
-        {
-          name: 'duration',
-          type: 'i64'
+          "name": "side",
+          "type": "u8"
         }
       ]
     },
     {
-      name: 'exitV2',
-      accounts: [
-        {
-          name: 'payer',
-          isMut: true,
-          isSigner: true
-        },
-        {
-          name: 'locker',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'escrow',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'escrowOwner',
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: 'lockedTokens',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'destinationTokens',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'tokenProgram',
-          isMut: false,
-          isSigner: false
-        }
-      ],
-      args: []
-    },
-    {
-      name: 'activateProposal',
-      accounts: [
-        {
-          name: 'locker',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'governor',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'proposal',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'escrow',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'escrowOwner',
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: 'governProgram',
-          isMut: false,
-          isSigner: false
-        }
-      ],
-      args: []
-    },
-    {
-      name: 'castVote',
-      accounts: [
-        {
-          name: 'locker',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'escrow',
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: 'voteDelegate',
-          isMut: false,
-          isSigner: true
-        },
-        {
-          name: 'proposal',
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: 'vote',
-          isMut: true,
-          isSigner: false
-        },
+      "name": "setVoteDelegate",
+      "accounts": [
         {
-          name: 'governor',
-          isMut: false,
-          isSigner: false
+          "name": "escrow",
+          "isMut": true,
+          "isSigner": false
         },
         {
-          name: 'governProgram',
-          isMut: false,
-          isSigner: false
+          "name": "escrowOwner",
+          "isMut": false,
+          "isSigner": true
         }
       ],
-      args: [
+      "args": [
         {
-          name: 'side',
-          type: 'u8'
+          "name": "newDelegate",
+          "type": "publicKey"
         }
       ]
     }
   ],
-  accounts: [
+  "accounts": [
     {
-      name: 'escrow',
-      type: {
-        kind: 'struct',
-        fields: [
+      "name": "escrow",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'locker',
-            type: 'publicKey'
+            "name": "locker",
+            "type": "publicKey"
           },
           {
-            name: 'owner',
-            type: 'publicKey'
+            "name": "owner",
+            "type": "publicKey"
           },
           {
-            name: 'bump',
-            type: 'u8'
+            "name": "bump",
+            "type": "u8"
           },
           {
-            name: 'tokens',
-            type: 'publicKey'
+            "name": "tokens",
+            "type": "publicKey"
           },
           {
-            name: 'amount',
-            type: 'u64'
+            "name": "amount",
+            "type": "u64"
           },
           {
-            name: 'escrowStartedAt',
-            type: 'i64'
+            "name": "escrowStartedAt",
+            "type": "i64"
           },
           {
-            name: 'escrowEndsAt',
-            type: 'i64'
-          }
-        ]
-      }
-    },
-    {
-      name: 'escrowV2',
-      type: {
-        kind: 'struct',
-        fields: [
-          {
-            name: 'locker',
-            type: 'publicKey'
-          },
-          {
-            name: 'owner',
-            type: 'publicKey'
-          },
-          {
-            name: 'bump',
-            type: 'u8'
-          },
-          {
-            name: 'tokens',
-            type: 'publicKey'
-          },
-          {
-            name: 'amount',
-            type: 'u64'
-          },
-          {
-            name: 'escrowStartedAt',
-            type: 'i64'
-          },
-          {
-            name: 'escrowEndsAt',
-            type: 'i64'
-          },
-          {
-            name: 'voteDelegate',
-            type: 'publicKey'
-          }
-        ]
-      }
-    },
-    {
-      name: 'locker',
-      type: {
-        kind: 'struct',
-        fields: [
-          {
-            name: 'base',
-            type: 'publicKey'
-          },
-          {
-            name: 'bump',
-            type: 'u8'
-          },
-          {
-            name: 'tokenMint',
-            type: 'publicKey'
-          },
-          {
-            name: 'lockedSupply',
-            type: 'u64'
-          },
-          {
-            name: 'admin',
-            type: 'publicKey'
+            "name": "escrowEndsAt",
+            "type": "i64"
           },
           {
-            name: 'params',
-            type: {
-              defined: 'LockerParams'
-            }
+            "name": "voteDelegate",
+            "type": "publicKey"
           }
         ]
       }
     },
     {
-      name: 'lockerV2',
-      type: {
-        kind: 'struct',
-        fields: [
+      "name": "locker",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'base',
-            type: 'publicKey'
+            "name": "base",
+            "type": "publicKey"
           },
           {
-            name: 'bump',
-            type: 'u8'
+            "name": "bump",
+            "type": "u8"
           },
           {
-            name: 'tokenMint',
-            type: 'publicKey'
+            "name": "tokenMint",
+            "type": "publicKey"
           },
           {
-            name: 'lockedSupply',
-            type: 'u64'
+            "name": "lockedSupply",
+            "type": "u64"
           },
           {
-            name: 'governor',
-            type: 'publicKey'
+            "name": "governor",
+            "type": "publicKey"
           },
           {
-            name: 'params',
-            type: {
-              defined: 'LockerParamsV2'
+            "name": "params",
+            "type": {
+              "defined": "LockerParams"
             }
           }
         ]
       }
     },
     {
-      name: 'whitelistEntry',
-      type: {
-        kind: 'struct',
-        fields: [
+      "name": "whitelistEntry",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'locker',
-            type: 'publicKey'
+            "name": "locker",
+            "type": "publicKey"
           },
           {
-            name: 'bump',
-            type: 'u8'
+            "name": "bump",
+            "type": "u8"
           },
           {
-            name: 'programId',
-            type: 'publicKey'
+            "name": "programId",
+            "type": "publicKey"
           },
           {
-            name: 'owner',
-            type: 'publicKey'
+            "name": "owner",
+            "type": "publicKey"
           }
         ]
       }
     }
   ],
-  types: [
+  "types": [
     {
-      name: 'LockerParams',
-      type: {
-        kind: 'struct',
-        fields: [
+      "name": "LockerParams",
+      "type": {
+        "kind": "struct",
+        "fields": [
           {
-            name: 'minStakeDuration',
-            type: 'u64'
+            "name": "minStakeDuration",
+            "type": "u64"
           },
           {
-            name: 'maxStakeDuration',
-            type: 'u64'
+            "name": "maxStakeDuration",
+            "type": "u64"
           },
           {
-            name: 'whitelistEnabled',
-            type: 'bool'
+            "name": "whitelistEnabled",
+            "type": "bool"
           },
           {
-            name: 'multiplier',
-            type: 'u8'
-          }
-        ]
-      }
-    },
-    {
-      name: 'LockerParamsV2',
-      type: {
-        kind: 'struct',
-        fields: [
-          {
-            name: 'minStakeDuration',
-            type: 'u64'
+            "name": "multiplier",
+            "type": "u8"
           },
           {
-            name: 'maxStakeDuration',
-            type: 'u64'
-          },
-          {
-            name: 'proposalActivationMinVotes',
-            type: 'u64'
-          },
-          {
-            name: 'whitelistEnabled',
-            type: 'bool'
-          },
-          {
-            name: 'multiplier',
-            type: 'u8'
+            "name": "proposalActivationMinVotes",
+            "type": "u64"
           }
         ]
       }
     }
   ],
-  events: [
+  "events": [
     {
-      name: 'ExitEscrowEvent',
-      fields: [
+      "name": "ExitEscrowEvent",
+      "fields": [
         {
-          name: 'escrowOwner',
-          type: 'publicKey',
-          index: false
+          "name": "escrowOwner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'locker',
-          type: 'publicKey',
-          index: false
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'timestamp',
-          type: 'i64',
-          index: false
+          "name": "timestamp",
+          "type": "i64",
+          "index": false
         },
         {
-          name: 'lockedSupply',
-          type: 'u64',
-          index: false
+          "name": "lockedSupply",
+          "type": "u64",
+          "index": false
         },
         {
-          name: 'releasedAmount',
-          type: 'u64',
-          index: false
+          "name": "releasedAmount",
+          "type": "u64",
+          "index": false
         }
       ]
     },
     {
-      name: 'InitEscrowEvent',
-      fields: [
+      "name": "InitEscrowEvent",
+      "fields": [
         {
-          name: 'escrow',
-          type: 'publicKey',
-          index: false
+          "name": "escrow",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'escrowOwner',
-          type: 'publicKey',
-          index: false
+          "name": "escrowOwner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'locker',
-          type: 'publicKey',
-          index: false
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'timestamp',
-          type: 'i64',
-          index: false
+          "name": "timestamp",
+          "type": "i64",
+          "index": false
         }
       ]
     },
     {
-      name: 'InitLockerEvent',
-      fields: [
+      "name": "InitLockerEvent",
+      "fields": [
         {
-          name: 'locker',
-          type: 'publicKey',
-          index: false
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'tokenMint',
-          type: 'publicKey',
-          index: false
+          "name": "tokenMint",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'admin',
-          type: 'publicKey',
-          index: false
+          "name": "governor",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'params',
-          type: {
-            defined: 'LockerParams'
+          "name": "params",
+          "type": {
+            "defined": "LockerParams"
           },
-          index: false
+          "index": false
         }
       ]
     },
     {
-      name: 'InitLockerV2Event',
-      fields: [
+      "name": "LockEvent",
+      "fields": [
         {
-          name: 'locker',
-          type: 'publicKey',
-          index: false
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'tokenMint',
-          type: 'publicKey',
-          index: false
+          "name": "escrowOwner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'governor',
-          type: 'publicKey',
-          index: false
+          "name": "tokenMint",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'params',
-          type: {
-            defined: 'LockerParamsV2'
-          },
-          index: false
-        }
-      ]
-    },
-    {
-      name: 'LockEvent',
-      fields: [
-        {
-          name: 'locker',
-          type: 'publicKey',
-          index: false
+          "name": "amount",
+          "type": "u64",
+          "index": false
         },
         {
-          name: 'escrowOwner',
-          type: 'publicKey',
-          index: false
+          "name": "lockerSupply",
+          "type": "u64",
+          "index": false
         },
         {
-          name: 'tokenMint',
-          type: 'publicKey',
-          index: false
+          "name": "duration",
+          "type": "i64",
+          "index": false
         },
         {
-          name: 'amount',
-          type: 'u64',
-          index: false
+          "name": "prevEscrowEndsAt",
+          "type": "i64",
+          "index": false
         },
         {
-          name: 'lockerSupply',
-          type: 'u64',
-          index: false
+          "name": "nextEscrowEndsAt",
+          "type": "i64",
+          "index": false
         },
         {
-          name: 'duration',
-          type: 'i64',
-          index: false
-        },
+          "name": "nextEscrowStartedAt",
+          "type": "i64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "SetVoteDelegateEvent",
+      "fields": [
         {
-          name: 'prevEscrowEndsAt',
-          type: 'i64',
-          index: false
+          "name": "escrowOwner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'nextEscrowEndsAt',
-          type: 'i64',
-          index: false
+          "name": "oldDelegate",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'nextEscrowStartedAt',
-          type: 'i64',
-          index: false
+          "name": "newDelegate",
+          "type": "publicKey",
+          "index": false
         }
       ]
     },
     {
-      name: 'ApproveLockPrivilegeEvent',
-      fields: [
+      "name": "ApproveLockPrivilegeEvent",
+      "fields": [
         {
-          name: 'locker',
-          type: 'publicKey',
-          index: false
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'programId',
-          type: 'publicKey',
-          index: false
+          "name": "programId",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'owner',
-          type: 'publicKey',
-          index: false
+          "name": "owner",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'timestamp',
-          type: 'i64',
-          index: false
+          "name": "timestamp",
+          "type": "i64",
+          "index": false
         }
       ]
     },
     {
-      name: 'RevokeLockPrivilegeEvent',
-      fields: [
+      "name": "RevokeLockPrivilegeEvent",
+      "fields": [
         {
-          name: 'locker',
-          type: 'publicKey',
-          index: false
+          "name": "locker",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'programId',
-          type: 'publicKey',
-          index: false
+          "name": "programId",
+          "type": "publicKey",
+          "index": false
         },
         {
-          name: 'timestamp',
-          type: 'i64',
-          index: false
+          "name": "timestamp",
+          "type": "i64",
+          "index": false
         }
       ]
     }
   ],
-  errors: [
+  "errors": [
     {
-      code: 6000,
-      name: 'EscrowNotEnded',
-      msg: 'Escrow has not ended.'
+      "code": 6000,
+      "name": "EscrowNotEnded",
+      "msg": "Escrow has not ended."
     },
     {
-      code: 6001,
-      name: 'InvalidLockerAdmin',
-      msg: 'Invalid locker admin'
+      "code": 6001,
+      "name": "InvalidLockerAdmin",
+      "msg": "Invalid locker admin"
     },
     {
-      code: 6002,
-      name: 'LockupDurationTooShort',
-      msg: 'Lockup duration must at least be the min stake duration.'
+      "code": 6002,
+      "name": "LockupDurationTooShort",
+      "msg": "Lockup duration must at least be the min stake duration."
     },
     {
-      code: 6003,
-      name: 'LockupDurationTooLong',
-      msg: 'Lockup duration must at most be the max stake duration.'
+      "code": 6003,
+      "name": "LockupDurationTooLong",
+      "msg": "Lockup duration must at most be the max stake duration."
     },
     {
-      code: 6004,
-      name: 'RefreshCannotShorten',
-      msg: 'A voting escrow refresh cannot shorten the escrow time remaining.'
+      "code": 6004,
+      "name": "RefreshCannotShorten",
+      "msg": "A voting escrow refresh cannot shorten the escrow time remaining."
     },
     {
-      code: 6005,
-      name: 'MustProvideWhitelist',
-      msg: 'Program whitelist enabled; please provide whitelist entry and instructions sysvar'
+      "code": 6005,
+      "name": "MustProvideWhitelist",
+      "msg": "Program whitelist enabled; please provide whitelist entry and instructions sysvar"
     },
     {
-      code: 6006,
-      name: 'ProgramNotWhitelisted',
-      msg: 'CPI caller not whitelisted to invoke lock instruction.'
+      "code": 6006,
+      "name": "ProgramNotWhitelisted",
+      "msg": "CPI caller not whitelisted to invoke lock instruction."
     },
     {
-      code: 6007,
-      name: 'EscrowOwnerNotWhitelisted',
-      msg: 'CPI caller not whitelisted for escrow owner to invoke lock instruction.'
+      "code": 6007,
+      "name": "EscrowOwnerNotWhitelisted",
+      "msg": "CPI caller not whitelisted for escrow owner to invoke lock instruction."
     },
     {
-      code: 6008,
-      name: 'EscrowExpired',
-      msg: 'Escrow was already expired.'
+      "code": 6008,
+      "name": "EscrowExpired",
+      "msg": "Escrow was already expired."
     },
     {
-      code: 6009,
-      name: 'LockedSupplyMismatch',
-      msg: 'Token lock failed, locked supply mismatches the exact amount.'
+      "code": 6009,
+      "name": "LockedSupplyMismatch",
+      "msg": "Token lock failed, locked supply mismatches the exact amount."
     },
     {
-      code: 6010,
-      name: 'EscrowInUse',
-      msg: 'The escrow has already locked.'
+      "code": 6010,
+      "name": "EscrowInUse",
+      "msg": "The escrow has already locked."
     },
     {
-      code: 6011,
-      name: 'EscrowNoBalance',
-      msg: "The escrow doesn't have balance"
+      "code": 6011,
+      "name": "EscrowNoBalance",
+      "msg": "The escrow doesn't have balance"
     },
     {
-      code: 6012,
-      name: 'ProposalMustBeActive',
-      msg: 'The proposal must be active'
+      "code": 6012,
+      "name": "ProposalMustBeActive",
+      "msg": "The proposal must be active"
     },
     {
-      code: 6013,
-      name: 'GovernorMismatch',
-      msg: 'Governor mismatch'
+      "code": 6013,
+      "name": "GovernorMismatch",
+      "msg": "Governor mismatch"
     },
     {
-      code: 6014,
-      name: 'ProgramIdMustBeExecutable',
-      msg: 'Program id must be executable'
+      "code": 6014,
+      "name": "ProgramIdMustBeExecutable",
+      "msg": "Program id must be executable"
     },
     {
-      code: 6015,
-      name: 'InsufficientVotingPower',
-      msg: 'Insufficient voting power to activate a proposal'
+      "code": 6015,
+      "name": "InsufficientVotingPower",
+      "msg": "Insufficient voting power to activate a proposal"
     }
   ]
 };
diff --git a/hooks/useStake.tsx b/hooks/useStake.tsx
index 03e4c66f..c6097b28 100644
--- a/hooks/useStake.tsx
+++ b/hooks/useStake.tsx
@@ -70,10 +70,10 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
         const [userKey] = await sc.getUserPDA(stakePool);
         // console.log('user key: ', userKey.toString());
         const user = await sc.fetchPoolUser(userKey);
-        const lockerAcc = await vc.fetchLockerV2(locker);
+        const lockerAcc = await vc.fetchLocker(locker);
         const [escrowKey] = await vc.getEscrowPDA(locker);
         // console.log('escrow: ', escrowKey.toString());
-        const escrow = await vc.fetchEscrowV2(escrowKey);
+        const escrow = await vc.fetchEscrow(escrowKey);
 
         setPool(pool);
         setUserKey(userKey);
@@ -197,7 +197,7 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
       if (sc && vc && userKey && honeyToken) {
         setIsLoading(true);
         try {
-          await vc.lockV2(
+          await vc.lock(
             locker,
             honeyToken.pubkey,
             amount,
@@ -221,7 +221,7 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
     if (vc) {
       setIsLoading(true);
       try {
-        await vc.unlockEscrowV2(locker, escrowKey, honeyToken?.pubkey);
+        await vc.unlockEscrow(locker, escrowKey, honeyToken?.pubkey);
         setIsLoading(false);
       } catch (e) {
         console.log(e);

From 868a6dc27a23060831b970b25bd4696ecf10f3c3 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Sat, 30 Jul 2022 12:55:04 +0200
Subject: [PATCH 084/101] refactor(governance): rename all V2 functions

---
 .../ExecuteProposalButton.tsx                 |   4 +-
 helpers/dao/constants.ts                      |   4 +-
 helpers/dao/programs/lockedVoter.ts           |   2 +-
 helpers/dao/sdk.ts                            |   4 +-
 helpers/dao/wrappers/lockedVoter/locker.ts    |   6 +-
 helpers/dao/wrappers/lockedVoter/setup.ts     |   4 +-
 helpers/programs/veHoney.ts                   |   2 +-
 helpers/sdk/stake.ts                          |   2 +-
 helpers/sdk/vehoney.ts                        | 136 +-----------------
 hooks/tribeca/useExecutiveCouncil.ts          |   2 +-
 10 files changed, 16 insertions(+), 150 deletions(-)

diff --git a/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx b/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
index eb2e8278..f8040383 100644
--- a/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
+++ b/components/GovernanceManageView/ExecutiveCouncilTab/ExecuteProposalButton.tsx
@@ -89,7 +89,7 @@ export const ExecuteProposalButton: React.FC<Props> = ({
         invariant(governorW && sdkMut && smartWallet && ecWallet.data);
         const sw = await sdkMut.loadSmartWallet(ecWallet.data.publicKey);
         const [invoker] = await sw.findOwnerInvokerAddress(0);
-        const invokeTX = await sw.ownerInvokeInstructionV2({
+        const invokeTX = await sw.ownerInvokeInstruction({
           instruction: sdkMut.programs.SmartWallet.instruction.approve({
             accounts: {
               smartWallet: smartWallet,
@@ -109,7 +109,7 @@ export const ExecuteProposalButton: React.FC<Props> = ({
         });
         const executeIX = executeTX.instructions[0];
         invariant(executeIX, 'executed');
-        const executeInvoke = await sw.ownerInvokeInstructionV2({
+        const executeInvoke = await sw.ownerInvokeInstruction({
           instruction: executeIX,
           index: 0
         });
diff --git a/helpers/dao/constants.ts b/helpers/dao/constants.ts
index 75221a0b..fe050b3d 100644
--- a/helpers/dao/constants.ts
+++ b/helpers/dao/constants.ts
@@ -10,7 +10,7 @@ import type {
   GovernTypes,
   LockedVoterProgram,
   LockedVoterTypes,
-  LockerParamsV2
+  LockerParams
 } from './programs';
 
 /**
@@ -80,7 +80,7 @@ export const DEFAULT_GOVERNANCE_PARAMETERS: GovernanceParameters = {
 /**
  * Default parameters for a Locker.
  */
-export const DEFAULT_LOCKER_PARAMS: LockerParamsV2 = {
+export const DEFAULT_LOCKER_PARAMS: LockerParams = {
   // 1M tokens if max locked.
   proposalActivationMinVotes: new BN(10_000_000 * 10 ** 6),
   // 1 day.
diff --git a/helpers/dao/programs/lockedVoter.ts b/helpers/dao/programs/lockedVoter.ts
index cac56e8b..82fa41ce 100644
--- a/helpers/dao/programs/lockedVoter.ts
+++ b/helpers/dao/programs/lockedVoter.ts
@@ -16,7 +16,7 @@ export type LockerData = Accounts['locker'];
 export type EscrowData = Accounts['escrow'];
 export type LockerWhitelistEntryData = Accounts['whitelistEntry'];
 
-export type LockerParamsV2 = LockedVoterTypes['Defined']['LockerParams'];
+export type LockerParams = LockedVoterTypes['Defined']['LockerParams'];
 
 export type LockedVoterError = LockedVoterTypes['Error'];
 export type LockedVoterProgram = LockedVoterTypes['Program'];
diff --git a/helpers/dao/sdk.ts b/helpers/dao/sdk.ts
index a2cbc121..6a6ea94f 100644
--- a/helpers/dao/sdk.ts
+++ b/helpers/dao/sdk.ts
@@ -14,7 +14,7 @@ import {
   HONEY_DAO_ADDRESSES,
   HONEY_DAO_IDLS
 } from './constants';
-import type { LockerParamsV2 } from './programs/lockedVoter';
+import type { LockerParams } from './programs/lockedVoter';
 import { GovernWrapper } from './wrappers';
 import { findLockerAddress } from './wrappers/lockedVoter/pda';
 
@@ -69,7 +69,7 @@ export class TribecaSDK {
     baseKP?: Keypair;
     governor: PublicKey;
     govTokenMint: PublicKey;
-  } & Partial<LockerParamsV2>): Promise<{
+  } & Partial<LockerParams>): Promise<{
     locker: PublicKey;
     tx: TransactionEnvelope;
   }> {
diff --git a/helpers/dao/wrappers/lockedVoter/locker.ts b/helpers/dao/wrappers/lockedVoter/locker.ts
index 14d7107e..8730286f 100644
--- a/helpers/dao/wrappers/lockedVoter/locker.ts
+++ b/helpers/dao/wrappers/lockedVoter/locker.ts
@@ -17,7 +17,7 @@ import type {
   EscrowData,
   LockedVoterProgram,
   LockerData,
-  LockerParamsV2,
+  LockerParams,
   ProposalData
 } from '../../programs';
 import type { TribecaSDK } from '../../sdk';
@@ -149,7 +149,7 @@ export class LockerWrapper {
     return new TransactionEnvelope(this.sdk.provider, [ix]);
   }
 
-  async lockTokensV2({
+  async lockTokens({
     amount,
     duration,
     authority = this.sdk.provider.wallet.publicKey
@@ -399,7 +399,7 @@ export class LockerWrapper {
   }
 
   async setLockerParamsIx(
-    args: LockerParamsV2
+    args: LockerParams
   ): Promise<TransactionInstruction> {
     const lockerData = await this.reload();
     const governorData = await this.sdk.programs.Govern.account.governor.fetch(
diff --git a/helpers/dao/wrappers/lockedVoter/setup.ts b/helpers/dao/wrappers/lockedVoter/setup.ts
index ead1ad59..cdbfdcf4 100644
--- a/helpers/dao/wrappers/lockedVoter/setup.ts
+++ b/helpers/dao/wrappers/lockedVoter/setup.ts
@@ -6,7 +6,7 @@ import { Keypair } from '@solana/web3.js';
 import type {
   GovernanceParameters,
   GovernorWrapper,
-  LockerParamsV2
+  LockerParams
 } from '../..';
 import {
   DEFAULT_GOVERNANCE_PARAMETERS,
@@ -36,7 +36,7 @@ export const createLocker = async ({
   govTokenMint: PublicKey;
   owners?: PublicKey[];
   governanceParameters?: Partial<GovernanceParameters>;
-  lockerParams?: Partial<LockerParamsV2>;
+  lockerParams?: Partial<LockerParams>;
   /**
    * Base of the governor.
    */
diff --git a/helpers/programs/veHoney.ts b/helpers/programs/veHoney.ts
index 5f729ef3..56c3c8cd 100644
--- a/helpers/programs/veHoney.ts
+++ b/helpers/programs/veHoney.ts
@@ -16,7 +16,7 @@ export type LockerData = Accounts['locker'];
 export type EscrowData = Accounts['escrow'];
 export type LockerWhitelistEntryData = Accounts['whitelistEntry'];
 
-export type LockerParamsV2 = LockedVoterTypes['Defined']['LockerParams'];
+export type LockerParams = LockedVoterTypes['Defined']['LockerParams'];
 
 export type LockedVoterError = LockedVoterTypes['Error'];
 export type LockedVoterProgram = LockedVoterTypes['Program'];
diff --git a/helpers/sdk/stake.ts b/helpers/sdk/stake.ts
index 538dfceb..a6637b99 100644
--- a/helpers/sdk/stake.ts
+++ b/helpers/sdk/stake.ts
@@ -156,7 +156,7 @@ export class StakeClient extends ClientBase<Stake> {
     hasEscrow?: boolean
   ) {
     const preInstructions = !hasEscrow
-      ? [...(await veHoneyClient.createInitializeEscrowV2Ix(locker))]
+      ? [...(await veHoneyClient.createInitializeEscrowIx(locker))]
       : undefined;
 
     const remainingAccounts = whitelistEnabled
diff --git a/helpers/sdk/vehoney.ts b/helpers/sdk/vehoney.ts
index a99b419b..8206c224 100644
--- a/helpers/sdk/vehoney.ts
+++ b/helpers/sdk/vehoney.ts
@@ -117,7 +117,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
     return { txSig, destination };
   }
 
-  async lockV2(
+  async lock(
     locker: PublicKey,
     source: PublicKey,
     amount: anchor.BN,
@@ -162,141 +162,7 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
     return { txSig, escrow };
   }
 
-  async fetchLockerV2(locker: PublicKey) {
-    try {
-      return await this.program.account.locker.fetch(locker);
-    } catch (e) {
-      console.log(e);
-    }
-  }
-
-  async fetchEscrowV2(escrow: PublicKey) {
-    try {
-      return await this.program.account.escrow.fetch(escrow);
-    } catch (e) {
-      console.log(e);
-    }
-  }
-
-  async createInitializeEscrowV2Ix(locker: PublicKey) {
-    const [escrow] = await this.getEscrowPDA(locker);
-    const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
-
-    return [
-      Token.createAssociatedTokenAccountInstruction(
-        ASSOCIATED_TOKEN_PROGRAM_ID,
-        TOKEN_PROGRAM_ID,
-        HONEY_MINT,
-        lockedTokens,
-        escrow,
-        this.wallet.publicKey
-      ),
-      await this.program.methods
-        .initEscrow()
-        .accounts({
-          payer: this.wallet.publicKey,
-          locker,
-          escrow,
-          escrowOwner: this.wallet.publicKey,
-          systemProgram: anchor.web3.SystemProgram.programId
-        })
-        .instruction()
-    ];
-  }
-
-  async unlockEscrowV2(
-    locker: PublicKey,
-    escrow?: PublicKey,
-    destination?: PublicKey
-  ) {
-    if (!escrow) {
-      [escrow] = await this.getEscrowPDA(locker);
-    }
-
-    let preInstructions: anchor.web3.TransactionInstruction[] = [];
-    if (!destination) {
-      destination = await Token.getAssociatedTokenAddress(
-        ASSOCIATED_TOKEN_PROGRAM_ID,
-        TOKEN_PROGRAM_ID,
-        HONEY_MINT,
-        this.wallet.publicKey
-      );
-
-      preInstructions.push(
-        Token.createAssociatedTokenAccountInstruction(
-          ASSOCIATED_TOKEN_PROGRAM_ID,
-          TOKEN_PROGRAM_ID,
-          HONEY_MINT,
-          destination,
-          this.wallet.publicKey,
-          this.wallet.publicKey
-        )
-      );
-    }
-
-    const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
-
-    const txSig = await this.program.methods
-      .exit()
-      .accounts({
-        payer: this.wallet.publicKey,
-        locker,
-        escrow,
-        escrowOwner: this.wallet.publicKey,
-        lockedTokens,
-        destinationTokens: destination,
-        tokenProgram: TOKEN_PROGRAM_ID
-      })
-      .preInstructions(preInstructions)
-      .rpc();
-
-    return { txSig, destination };
-  }
-
-  async lock(
-    locker: PublicKey,
-    source: PublicKey,
-    amount: anchor.BN,
-    duration: anchor.BN,
-    hasEscrow?: boolean
-  ) {
-    const preInstructions = [];
-    if (!hasEscrow) {
-      preInstructions.push(...(await this.createInitializeEscrowV2Ix(locker)));
-    }
 
-    const remainingAccounts = [
-      {
-        pubkey: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
-        isSigner: false,
-        isWritable: false
-      },
-      {
-        pubkey: this.program.programId,
-        isSigner: false,
-        isWritable: false
-      }
-    ];
-
-    const [escrow] = await this.getEscrowPDA(locker);
-    const lockedTokens = await this.getEscrowLockedTokenPDA(escrow);
-
-    const txSig = await this.program.methods
-      .lock(new anchor.BN(amount), new anchor.BN(duration))
-      .accounts({
-        locker,
-        escrow,
-        lockedTokens,
-        escrowOwner: this.wallet.publicKey,
-        sourceTokens: source,
-        sourceTokensAuthority: this.wallet.publicKey,
-        tokenProgram: TOKEN_PROGRAM_ID
-      })
-      .remainingAccounts(remainingAccounts)
-      .preInstructions(preInstructions)
-      .rpc();
-    return { txSig, escrow };
-  }
 
   async getEscrowPDA(locker: PublicKey) {
     return anchor.web3.PublicKey.findProgramAddress(
diff --git a/hooks/tribeca/useExecutiveCouncil.ts b/hooks/tribeca/useExecutiveCouncil.ts
index 79bd833d..301bff79 100644
--- a/hooks/tribeca/useExecutiveCouncil.ts
+++ b/hooks/tribeca/useExecutiveCouncil.ts
@@ -64,7 +64,7 @@ export const useExecutiveCouncil = () => {
     const sw = await sdkMut.loadSmartWallet(ecWallet.data?.publicKey);
     const allTXs = await Promise.all(
       tx.instructions.map(async instruction => {
-        return await sw.ownerInvokeInstructionV2({
+        return await sw.ownerInvokeInstruction({
           instruction,
           index: subaccountInfo.account.index.toNumber()
         });

From 7ae83a2ef287895de2a01e25b2613afcfcec6eea Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Sat, 30 Jul 2022 15:37:25 +0200
Subject: [PATCH 085/101] feat(governance): add unlock locker buttons to Honey
 and Vehoney modals

---
 components/HoneyModal/HoneyModal.tsx     | 18 +++++++++++++++++-
 components/VeHoneyModal/VeHoneyModal.tsx | 24 ++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/components/HoneyModal/HoneyModal.tsx b/components/HoneyModal/HoneyModal.tsx
index 45631124..b2849cf2 100644
--- a/components/HoneyModal/HoneyModal.tsx
+++ b/components/HoneyModal/HoneyModal.tsx
@@ -47,7 +47,7 @@ const HoneyModal = () => {
   );
   // ============================================================================
 
-  const { lock, escrow } = useStake(STAKE_POOL_ADDRESS, LOCKER_ADDRESS);
+  const { lock, unlock, escrow } = useStake(STAKE_POOL_ADDRESS, LOCKER_ADDRESS);
 
   const lockedAmount = useMemo(() => {
     if (!escrow) {
@@ -65,6 +65,19 @@ const HoneyModal = () => {
     return convertBnTimestampToDate(escrow.escrowEndsAt);
   }, [escrow]);
 
+  const lockPeriodHasEnded = useMemo((): boolean => {
+    if (!escrow) {
+      return true;
+    }
+    const lockEndsTimestamp = convert(escrow.escrowEndsAt, 0);
+    const currentTimestamp = new Date().getTime();
+
+    if (lockEndsTimestamp  >= currentTimestamp) {
+      return true;
+    }
+    return false;
+  }, [escrow]);
+
   const veHoneyAmount = useMemo(() => {
     if (!escrow) {
       return 0;
@@ -170,6 +183,9 @@ const HoneyModal = () => {
           >
             {amount ? 'Deposit' : 'Enter amount'}
           </Button>
+          <Button onClick={unlock} disabled={lockPeriodHasEnded} width="full">
+            Unlock
+          </Button>
         </Stack>
       </Box>
     </Box>
diff --git a/components/VeHoneyModal/VeHoneyModal.tsx b/components/VeHoneyModal/VeHoneyModal.tsx
index 07c65957..83e3da0f 100644
--- a/components/VeHoneyModal/VeHoneyModal.tsx
+++ b/components/VeHoneyModal/VeHoneyModal.tsx
@@ -64,7 +64,10 @@ const VeHoneyModal = () => {
   );
   // ============================================================================
 
-  const { stake, escrow } = useStake(STAKE_POOL_ADDRESS, LOCKER_ADDRESS);
+  const { stake, unlock, escrow } = useStake(
+    STAKE_POOL_ADDRESS,
+    LOCKER_ADDRESS
+  );
 
   const lockedAmount = useMemo(() => {
     if (!escrow) {
@@ -82,6 +85,21 @@ const VeHoneyModal = () => {
     return convertBnTimestampToDate(escrow.escrowEndsAt);
   }, [escrow]);
 
+  const lockPeriodHasEnded = useMemo((): boolean => {
+    if (!escrow) {
+      return true;
+    }
+    const lockEndsTimestamp = convert(escrow.escrowEndsAt, 0);
+    const currentTimestamp = new Date().getTime();
+
+    if (lockEndsTimestamp <= currentTimestamp) {
+      return false;
+    }
+    return true;
+  }, [escrow]);
+
+  // console.log(new Date().getTime())
+
   const veHoneyAmount = useMemo(() => {
     if (!escrow) {
       return 0;
@@ -104,7 +122,6 @@ const VeHoneyModal = () => {
   const handleStake = useCallback(async () => {
     if (!amount || !vestingPeriodInSeconds) return;
 
-    // console.log(vestingPeriodInSeconds);
 
     await stake(
       convertToBN(amount, PHONEY_DECIMALS),
@@ -205,6 +222,9 @@ const VeHoneyModal = () => {
           >
             {amount ? 'Deposit' : 'Enter amount'}
           </Button>
+          <Button onClick={unlock}  disabled={lockPeriodHasEnded} width="full">
+            Unlock
+          </Button>
         </Stack>
       </Box>
     </Box>

From 5cd2a8a3c25892f0020ec0bcc66b32c39c2115cc Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Mon, 1 Aug 2022 18:19:09 +0200
Subject: [PATCH 086/101] fix(governance): fix  enviroment variable

---
 components/Proposals/ProposalsList/index.tsx | 8 +++++---
 pages/governance/index.tsx                   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/Proposals/ProposalsList/index.tsx b/components/Proposals/ProposalsList/index.tsx
index 0b435e9e..4f4c5254 100644
--- a/components/Proposals/ProposalsList/index.tsx
+++ b/components/Proposals/ProposalsList/index.tsx
@@ -7,7 +7,7 @@ import { useProposals } from 'hooks/tribeca/useProposals';
 import { PageNav } from './PageNav';
 import { PlaceholderCard } from './PlaceholderCard';
 import { ProposalCard } from './ProposalCard';
-import { Box, Text } from 'degen';
+import { Box, Text , Button} from 'degen';
 
 const NUM_PLACEHOLDERS = 0;
 const PROPOSALS_PER_PAGE = 20;
@@ -98,11 +98,13 @@ export const ProposalsList: React.FC<Props> = ({
 
   if (proposalCount === 0 || allProposals.length === 0) {
     return (
-      <Box>
+      <Box >
         <EmptyState title="There aren't any proposals yet.">
           <Text>
-            <Link href={'/governance/proposals/create'} passHref>
+          <Link href={'/governance/proposals/create'} passHref>
+            <Button justifyContent={"space-between"} size='small'>
               Create a proposal
+            </Button>
             </Link>
           </Text>
         </EmptyState>
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 3158d467..c08558a8 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -65,7 +65,7 @@ const Governance: NextPage = () => {
     : lockedSupply;
 
   const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_PUBLIC_STAKE_POOL_ADDR ||
+    process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
       'Cv9Hx3VRvqkz5JRPiZM8A2BH31yvpcT4qiUJLdtgu7TE'
   );
   const LOCKER_ADDRESS = new PublicKey(

From 48943a3acccc717dff74746273eb6937b3540447 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Thu, 4 Aug 2022 17:20:35 +0200
Subject: [PATCH 087/101] feat(governance): add totalVeHoney supply

---
 components/Proposals/ProposalsList/index.tsx |  4 +--
 helpers/sdk/vehoney.ts                       |  4 +++
 hooks/useStake.tsx                           | 28 +++++++++++------
 package.json                                 |  1 +
 pages/governance/index.tsx                   | 33 +++++++++++---------
 5 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/components/Proposals/ProposalsList/index.tsx b/components/Proposals/ProposalsList/index.tsx
index 4f4c5254..91f6542a 100644
--- a/components/Proposals/ProposalsList/index.tsx
+++ b/components/Proposals/ProposalsList/index.tsx
@@ -7,7 +7,7 @@ import { useProposals } from 'hooks/tribeca/useProposals';
 import { PageNav } from './PageNav';
 import { PlaceholderCard } from './PlaceholderCard';
 import { ProposalCard } from './ProposalCard';
-import { Box, Text , Button} from 'degen';
+import { Box, Text } from 'degen';
 
 const NUM_PLACEHOLDERS = 0;
 const PROPOSALS_PER_PAGE = 20;
@@ -102,9 +102,7 @@ export const ProposalsList: React.FC<Props> = ({
         <EmptyState title="There aren't any proposals yet.">
           <Text>
           <Link href={'/governance/proposals/create'} passHref>
-            <Button justifyContent={"space-between"} size='small'>
               Create a proposal
-            </Button>
             </Link>
           </Text>
         </EmptyState>
diff --git a/helpers/sdk/vehoney.ts b/helpers/sdk/vehoney.ts
index 8206c224..9470dffe 100644
--- a/helpers/sdk/vehoney.ts
+++ b/helpers/sdk/vehoney.ts
@@ -200,4 +200,8 @@ export class VeHoneyClient extends ClientBase<VeHoney> {
       this.program.programId
     );
   }
+  
+  async getAllEscrowAccounts() {
+    return this.program.account.escrow.all();
+  }
 }
diff --git a/hooks/useStake.tsx b/hooks/useStake.tsx
index c6097b28..281d6af4 100644
--- a/hooks/useStake.tsx
+++ b/hooks/useStake.tsx
@@ -9,7 +9,7 @@ import { useAccounts } from './useAccounts';
 import { HONEY_MINT, PHONEY_MINT, HONEY_DECIMALS } from 'helpers/sdk/constant';
 import { VeHoneyClient, PoolParams } from 'helpers/sdk';
 import { toast } from 'react-toastify';
-import { convert } from 'helpers/utils';
+import { calcVeHoneyAmount, convert } from 'helpers/utils';
 
 //this fn takes the error caught in a tryCatch block and check for
 //some specified errors and show toast notifications for them
@@ -197,13 +197,7 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
       if (sc && vc && userKey && honeyToken) {
         setIsLoading(true);
         try {
-          await vc.lock(
-            locker,
-            honeyToken.pubkey,
-            amount,
-            duration,
-            hasEscrow
-          );
+          await vc.lock(locker, honeyToken.pubkey, amount, duration, hasEscrow);
           toast.success('HONEY successfully vested');
           setIsLoading(false);
         } catch (e) {
@@ -231,6 +225,21 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
     }
   }, [vc, escrowKey, honeyToken]);
 
+  const totalVeHoney = useCallback(async () => {
+    const allEscrowAccounts = await vc?.getAllEscrowAccounts();
+    let totalHoney: number = 0;
+
+    allEscrowAccounts?.forEach(escrow => {
+      const amount = escrow.account.amount;
+      const startDate = escrow.account.escrowStartedAt;
+      const endDate = escrow.account.escrowEndsAt;
+      const userVeHoneyAmount = calcVeHoneyAmount(startDate, endDate, amount);
+
+      totalHoney += userVeHoneyAmount;
+    });
+    return totalHoney;
+  }, [vc]);
+
   const claimableAmount = useMemo(() => {
     if (pool && user) {
       const params = pool.params as PoolParams;
@@ -283,6 +292,7 @@ export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
     stake,
     lock,
     unlock,
-    claimableAmount
+    claimableAmount,
+    totalVeHoney
   };
 };
diff --git a/package.json b/package.json
index 1ad39999..98a6fe25 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
+    "serve": "yarn build && yarn start",
     "lint": "next lint",
     "postinstall": "patch-package"
   },
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index c08558a8..37323156 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -3,7 +3,7 @@ import { Box, Button, Card, IconExclamation, Stat, Text } from 'degen';
 import { Stack } from 'degen';
 import Layout from '../../components/Layout/Layout';
 import ModalContainer from 'components/ModalContainer/ModalContainer';
-import { useState, useMemo } from 'react';
+import { useState, useMemo, useEffect } from 'react';
 import PHoneyModal from 'components/PHoneyModal/PHoneyModal';
 import VeHoneyModal from 'components/VeHoneyModal/VeHoneyModal';
 import HoneyModal from 'components/HoneyModal/HoneyModal';
@@ -38,6 +38,7 @@ const Governance: NextPage = () => {
   const [showPHoneyModal, setShowPHoneyModal] = useState(false);
   const [showVeHoneyModal, setShowVeHoneyModal] = useState(false);
   const [showHoneyModal, setShowHoneyModal] = useState(false);
+  const [vehoneySupply, setVehoneySupply] = useState("");
 
   const { tokenAccounts } = useAccounts();
   // ======================== Should replace with configuration ================
@@ -45,7 +46,8 @@ const Governance: NextPage = () => {
   const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
 
   const { govToken, veToken, lockedSupply } = useGovernor();
-  const totalVeTokens = useTokenAmount(veToken, '0');
+
+  // const totalVeTokens = useTokenAmount(veToken, '0');
   const { data: govTokenData } = useTokenMint(govToken?.mintAccount);
   const totalSupplyFmt =
     govTokenData && govToken
@@ -74,22 +76,27 @@ const Governance: NextPage = () => {
   );
   // ============================================================================
 
-  const { user, escrow } = useStake(STAKE_POOL_ADDRESS, LOCKER_ADDRESS);
+  const { user, escrow, totalVeHoney } = useStake(
+    STAKE_POOL_ADDRESS,
+    LOCKER_ADDRESS
+  );
 
-  const lockedAmount = useMemo(() => {
-    if (!escrow) {
-      return 0;
-    }
+  async function getVeHoneySupply() {
+    const response = await totalVeHoney()
+    
+    setVehoneySupply(response.toFixed(0))
+  }
 
-    return convert(escrow.amount, HONEY_DECIMALS);
-  }, [escrow]);
+  useEffect(()=>{
+    getVeHoneySupply()
+  }, [getVeHoneySupply])
 
-  const lockedPeriodStart = useMemo(() => {
+  const lockedAmount = useMemo(() => {
     if (!escrow) {
       return 0;
     }
 
-    return convertBnTimestampToDate(escrow.escrowStartedAt);
+    return convert(escrow.amount, HONEY_DECIMALS);
   }, [escrow]);
 
   const lockedPeriodEnd = useMemo(() => {
@@ -213,9 +220,7 @@ const Governance: NextPage = () => {
                   value={
                     <NumberFormat
                       thousandSeparator
-                      value={totalVeTokens?.asNumber.toLocaleString(undefined, {
-                        maximumFractionDigits: 0
-                      })}
+                      value={vehoneySupply.toString()}
                       displayType={'text'}
                     />
                   }

From d3c439a47f7b06d3e4b8d6a9ca680b254c990cc3 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Thu, 4 Aug 2022 17:51:38 +0200
Subject: [PATCH 088/101] fix(governance): fix `package.json`

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ae988b6e..905e5c46 100644
--- a/package.json
+++ b/package.json
@@ -60,8 +60,8 @@
     "react-toastify": "^8.2.0",
     "recharts": "^2.1.9",
     "yarn": "^1.22.18",
-    "yup": "^0.32.11"
-    "swr": "^1.3.0",
+    "yup": "^0.32.11",
+    "swr": "^1.3.0"
   },
   "devDependencies": {
     "@types/node": "17.0.21",

From 696f0b1a4d8db580c8ccf052bb191d0a8e5825b8 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Thu, 4 Aug 2022 18:07:43 +0200
Subject: [PATCH 089/101] fix(governance): fix package dependencies error from
 merge

---
 package.json               |   4 +-
 pages/governance/index.tsx |   9 +-
 yarn.lock                  | 379 ++++++++++++++++++++++++++++++++++---
 3 files changed, 362 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index 905e5c46..eaee1a4f 100644
--- a/package.json
+++ b/package.json
@@ -85,6 +85,8 @@
   },
   "resolutions": {
     "jsbi": "^4",
-    "@saberhq/solana-contrib": "^1.12.69"
+    "@saberhq/solana-contrib": "^1.12.69",
+    "@types/react": "17.0.2",
+    "@types/react-dom": "17.0.2"
   }
 }
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index c23e1451..189efdc8 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -15,7 +15,7 @@ import {
 import { Stack } from 'degen';
 import Layout from '../../components/Layout/Layout';
 import ModalContainer from 'components/ModalContainer/ModalContainer';
-import { useState, useMemo, useEffect } from 'react';
+import { useState, useMemo, useEffect, useCallback } from 'react';
 import PHoneyModal from 'components/PHoneyModal/PHoneyModal';
 import VeHoneyModal from 'components/VeHoneyModal/VeHoneyModal';
 import HoneyModal from 'components/HoneyModal/HoneyModal';
@@ -93,15 +93,16 @@ const Governance: NextPage = () => {
     LOCKER_ADDRESS
   );
 
-  async function getVeHoneySupply() {
+  const getVeHoneySupply = useCallback(async () => {
     const response = await totalVeHoney()
     
     setVehoneySupply(response.toFixed(0))
-  }
+  }, [totalVeHoney])
+ 
 
   useEffect(()=>{
     getVeHoneySupply()
-  }, [getVeHoneySupply])
+  }, [getVeHoneySupply, totalVeHoney])
 
   const lockedAmount = useMemo(() => {
     if (!escrow) {
diff --git a/yarn.lock b/yarn.lock
index da497c48..bede3cac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -193,6 +193,13 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.17.2":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a"
+  integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.12.13", "@babel/template@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
@@ -1130,6 +1137,29 @@
     superstruct "^0.14.2"
     tweetnacl "^1.0.0"
 
+"@solana/web3.js@^1.47.3":
+  version "1.50.1"
+  resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.50.1.tgz#dae726a06267d1bcd88b1e3cd8ae44c709302dcf"
+  integrity sha512-1l9N/nS8pJEA2YibNT8wa072718O0/A1eKWE0+pdWC5wDGQgBNxZSLuv7Cq5Dcn46WsZ5J5ZstK89q8J/ZZaQA==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@ethersproject/sha2" "^5.5.0"
+    "@solana/buffer-layout" "^4.0.0"
+    bigint-buffer "^1.1.5"
+    bn.js "^5.0.0"
+    borsh "^0.7.0"
+    bs58 "^4.0.1"
+    buffer "6.0.1"
+    fast-stable-stringify "^1.0.0"
+    jayson "^3.4.4"
+    js-sha3 "^0.8.0"
+    node-fetch "2"
+    react-native-url-polyfill "^1.3.0"
+    rpc-websockets "^7.5.0"
+    secp256k1 "^4.0.2"
+    superstruct "^0.14.2"
+    tweetnacl "^1.0.0"
+
 "@solflare-wallet/sdk@^1.0.11":
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/@solflare-wallet/sdk/-/sdk-1.0.11.tgz#2eaf3d5935f96dc4286ae356c4c83f6866947ff2"
@@ -1358,19 +1388,25 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
-"@types/react@17.0.39":
-  version "17.0.39"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.39.tgz#d0f4cde092502a6db00a1cded6e6bf2abb7633ce"
-  integrity sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug==
+"@types/react-dom@17.0.2":
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.2.tgz#35654cf6c49ae162d5bc90843d5437dc38008d43"
+  integrity sha512-Icd9KEgdnFfJs39KyRyr0jQ7EKhq8U6CcHRMGAS45fp5qgUvxL3ujUCfWFttUK2UErqZNj97t9gsVPNAqcwoCg==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react@*", "@types/react@17.0.2", "@types/react@^17.0.41":
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
+  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
   dependencies:
     "@types/prop-types" "*"
-    "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/react@^17.0.41":
-  version "17.0.43"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.43.tgz#4adc142887dd4a2601ce730bc56c3436fdb07a55"
-  integrity sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A==
+"@types/react@17.0.39":
+  version "17.0.39"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.39.tgz#d0f4cde092502a6db00a1cded6e6bf2abb7633ce"
+  integrity sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -1408,6 +1444,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/yauzl@^2.9.1":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599"
+  integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==
+  dependencies:
+    "@types/node" "*"
+
 "@typescript-eslint/parser@^5.0.0":
   version "5.16.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.16.0.tgz#e4de1bde4b4dad5b6124d3da227347616ed55508"
@@ -1577,6 +1620,13 @@ acorn@^8.7.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
   integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
 
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
 ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
@@ -1895,6 +1945,15 @@ bip32@^2.0.6:
     typeforce "^1.11.5"
     wif "^2.0.6"
 
+bl@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
 bn.js@^4.11.8, bn.js@^4.11.9:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
@@ -2038,6 +2097,11 @@ bs58check@<3.0.0, bs58check@^2.1.1:
     create-hash "^1.1.0"
     safe-buffer "^5.1.2"
 
+buffer-crc32@~0.2.3:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
+
 buffer-indexof@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
@@ -2064,6 +2128,14 @@ buffer@6.0.3, buffer@^6.0.3, buffer@~6.0.3:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
+buffer@^5.2.1, buffer@^5.4.3, buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
 bufferutil@^4.0.1:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.6.tgz#ebd6c67c7922a0e902f053e5d8be5ec850e48433"
@@ -2165,6 +2237,18 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
+chrome-aws-lambda@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/chrome-aws-lambda/-/chrome-aws-lambda-10.1.0.tgz#ac43b4cdfc1fbb2275c62effada560858099501e"
+  integrity sha512-NZQVf+J4kqG4sVhRm3WNmOfzY0OtTSm+S8rg77pwePa9RCYHzhnzRs8YvNI6L9tALIW6RpmefWiPURt3vURXcw==
+  dependencies:
+    lambdafs "^2.0.3"
+
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -2533,6 +2617,20 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
+debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+debug@4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+  dependencies:
+    ms "2.1.2"
+
 debug@^3.1.1, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -2540,13 +2638,6 @@ debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -2699,6 +2790,11 @@ detect-node@^2.0.4, detect-node@^2.1.0:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
+devtools-protocol@0.0.901419:
+  version "0.0.901419"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz#79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd"
+  integrity sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==
+
 diff@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
@@ -2808,7 +2904,7 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-end-of-stream@^1.1.0:
+end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -3283,6 +3379,17 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+extract-zip@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
+  dependencies:
+    debug "^4.1.1"
+    get-stream "^5.1.0"
+    yauzl "^2.10.0"
+  optionalDependencies:
+    "@types/yauzl" "^2.9.1"
+
 eyes@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
@@ -3343,6 +3450,13 @@ faye-websocket@^0.11.3, faye-websocket@^0.11.4:
   dependencies:
     websocket-driver ">=0.5.1"
 
+fd-slicer@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
+  dependencies:
+    pend "~1.2.0"
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -3404,7 +3518,7 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^4.1.0:
+find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -3493,6 +3607,11 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
 fs-extra@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
@@ -3502,6 +3621,15 @@ fs-extra@^7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^8.0.1:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -3561,6 +3689,13 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -3660,7 +3795,7 @@ graceful-fs@^4.1.11:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
   integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -3843,6 +3978,14 @@ http-proxy@^1.17.0:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
+https-proxy-agent@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -3850,7 +3993,7 @@ iconv-lite@0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-ieee754@^1.2.1:
+ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -4358,6 +4501,15 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-5.0.0.tgz#e6b718f73da420d612823996fdf14a03f6ff6922"
+  integrity sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==
+  dependencies:
+    universalify "^0.1.2"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -4412,6 +4564,13 @@ kleur@^4.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.4.tgz#8c202987d7e577766d039a8cd461934c01cda04d"
   integrity sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA==
 
+lambdafs@^2.0.3:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/lambdafs/-/lambdafs-2.1.1.tgz#4bf8d3037b6c61bbb4a22ab05c73ee47964c25ed"
+  integrity sha512-x5k8JcoJWkWLvCVBzrl4pzvkEHSgSBqFjg3Dpsc4AcTMq7oUMym4cL/gRTZ6VM4mUMY+M0dIbQ+V1c1tsqqanQ==
+  dependencies:
+    tar-fs "^2.1.1"
+
 language-subtag-registry@~0.3.2:
   version "0.3.21"
   resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz#04ac218bea46f04cb039084602c6da9e788dd45a"
@@ -4946,6 +5105,11 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+mkdirp-classic@^0.5.2:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
+  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
+
 mkdirp@^0.5.1, mkdirp@^0.5.5:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -5035,6 +5199,15 @@ negotiator@0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+next-api-og-image@^4.0.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/next-api-og-image/-/next-api-og-image-4.2.1.tgz#8e61dd490da4ac79b6db1269d132e6e6308f4d7d"
+  integrity sha512-I6PwEBLadD2zzXnfjNIXNCCx9N8DKSIMFNiaCidJadSUGwmY4/8MotooMJdahuUk6kAcgMnli7XfiuLAsTKEpw==
+  dependencies:
+    deepmerge "^4.2.2"
+    puppeteer-core "^10.4.0"
+    twemoji "^13.1.0"
+
 next@12.1.0:
   version "12.1.0"
   resolved "https://registry.yarnpkg.com/next/-/next-12.1.0.tgz#c33d753b644be92fc58e06e5a214f143da61dd5d"
@@ -5076,13 +5249,18 @@ node-addon-api@^2.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32"
   integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==
 
-node-fetch@2.6.7:
+node-fetch@2, node-fetch@2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 
+node-fetch@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+
 node-forge@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
@@ -5468,6 +5646,11 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+pend@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -5505,6 +5688,13 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
+pkg-dir@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -5579,6 +5769,11 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
+progress@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31"
+  integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==
+
 promise-retry@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
@@ -5614,6 +5809,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -5632,11 +5832,29 @@ punycode@1.3.2:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
   integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+puppeteer-core@^10.4.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-10.4.0.tgz#4e2da57c52339b8c07cd9362922020eb3c3c95bf"
+  integrity sha512-KU8zyb7AIOqNjLCN3wkrFXxh+EVaG+zrs2P03ATNjc3iwSxHsu5/EvZiREpQ/IJiT9xfQbDVgKcsvRuzLCxglQ==
+  dependencies:
+    debug "4.3.1"
+    devtools-protocol "0.0.901419"
+    extract-zip "2.0.1"
+    https-proxy-agent "5.0.0"
+    node-fetch "2.6.1"
+    pkg-dir "4.2.0"
+    progress "2.0.1"
+    proxy-from-env "1.1.0"
+    rimraf "3.0.2"
+    tar-fs "2.0.0"
+    unbzip2-stream "1.3.3"
+    ws "7.4.6"
+
 qs@6.9.7:
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
@@ -5757,6 +5975,13 @@ react-markdown@^8.0.3:
     unist-util-visit "^4.0.0"
     vfile "^5.0.0"
 
+react-native-url-polyfill@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/react-native-url-polyfill/-/react-native-url-polyfill-1.3.0.tgz#c1763de0f2a8c22cc3e959b654c8790622b6ef6a"
+  integrity sha512-w9JfSkvpqqlix9UjDvJjm1EjSt652zVQ6iwCIj1cVVkwXf4jQhQgTNXY6EVTwuAmUjg6BC6k9RHCBynoLFo3IQ==
+  dependencies:
+    whatwg-url-without-unicode "8.0.0-3"
+
 react-number-format@^4.9.1:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/react-number-format/-/react-number-format-4.9.1.tgz#62b3450b43c911f9227e770a8ea9fa606696e52e"
@@ -5881,7 +6106,7 @@ readable-stream@^2.0.1, readable-stream@^2.0.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.6, readable-stream@^3.6.0:
+readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -6124,6 +6349,19 @@ rpc-websockets@^7.4.2:
     bufferutil "^4.0.1"
     utf-8-validate "^5.0.2"
 
+rpc-websockets@^7.5.0:
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.5.0.tgz#bbeb87572e66703ff151e50af1658f98098e2748"
+  integrity sha512-9tIRi1uZGy7YmDjErf1Ax3wtqdSSLIlnmL5OtOzgd5eqPKbsPpwDP5whUDO2LQay3Xp0CcHlcNSGzacNRluBaQ==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    eventemitter3 "^4.0.7"
+    uuid "^8.3.2"
+    ws "^8.5.0"
+  optionalDependencies:
+    bufferutil "^4.0.1"
+    utf-8-validate "^5.0.2"
+
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -6664,6 +6902,42 @@ swr@^1.0.1:
   resolved "https://registry.yarnpkg.com/swr/-/swr-1.2.2.tgz#6cae09928d30593a7980d80f85823e57468fac5d"
   integrity sha512-ky0BskS/V47GpW8d6RU7CPsr6J8cr7mQD6+do5eky3bM0IyJaoi3vO8UhvrzJaObuTlGhPl2szodeB2dUd76Xw==
 
+swr@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/swr/-/swr-1.3.0.tgz#c6531866a35b4db37b38b72c45a63171faf9f4e8"
+  integrity sha512-dkghQrOl2ORX9HYrMDtPa7LTVHJjCTeZoB1dqTbnnEDlSvN8JEKpYIYurDfvbQFUUS8Cg8PceFVZNkW0KNNYPw==
+
+tar-fs@*:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
+  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
+  dependencies:
+    chownr "^1.1.1"
+    mkdirp-classic "^0.5.2"
+    pump "^3.0.0"
+    tar-stream "^2.1.4"
+
+tar-fs@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad"
+  integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==
+  dependencies:
+    chownr "^1.1.1"
+    mkdirp "^0.5.1"
+    pump "^3.0.0"
+    tar-stream "^2.0.0"
+
+tar-stream@^2.0.0, tar-stream@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
 text-encoding-utf-8@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13"
@@ -6674,7 +6948,7 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-"through@>=2.2.7 <3":
+"through@>=2.2.7 <3", through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -6816,6 +7090,21 @@ tweetnacl@^1.0.0, tweetnacl@^1.0.3:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
   integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
 
+twemoji-parser@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/twemoji-parser/-/twemoji-parser-13.1.0.tgz#65e7e449c59258791b22ac0b37077349127e3ea4"
+  integrity sha512-AQOzLJpYlpWMy8n+0ATyKKZzWlZBJN+G0C+5lhX7Ftc2PeEVdUU/7ns2Pn2vVje26AIZ/OHwFoUbdv6YYD/wGg==
+
+twemoji@^13.1.0:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/twemoji/-/twemoji-13.1.1.tgz#6e31409908bb5383cdb1d09c9c8e7856aa6e2e3b"
+  integrity sha512-IIIoq+n1lk1M1+evBKZD3DO0ud02fDQ4ssbgAv8rp3YBWUeNmskjlisFUPPDacQ50XS3bhrd4Kq9Q2gqhxb0dg==
+  dependencies:
+    fs-extra "^8.0.1"
+    jsonfile "^5.0.0"
+    twemoji-parser "13.1.0"
+    universalify "^0.1.2"
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -6871,6 +7160,14 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
+unbzip2-stream@1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a"
+  integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==
+  dependencies:
+    buffer "^5.2.1"
+    through "^2.3.8"
+
 unified@^10.0.0:
   version "10.1.2"
   resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.2.tgz#b1d64e55dafe1f0b98bb6c719881103ecf6c86df"
@@ -6959,7 +7256,7 @@ unist-util-visit@^4.0.0:
     unist-util-is "^5.0.0"
     unist-util-visit-parents "^5.0.0"
 
-universalify@^0.1.0:
+universalify@^0.1.0, universalify@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
@@ -7138,6 +7435,11 @@ webidl-conversions@^3.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
 
+webidl-conversions@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
+  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
+
 webpack-dev-middleware@^3.7.2:
   version "3.7.3"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
@@ -7210,6 +7512,15 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
+whatwg-url-without-unicode@8.0.0-3:
+  version "8.0.0-3"
+  resolved "https://registry.yarnpkg.com/whatwg-url-without-unicode/-/whatwg-url-without-unicode-8.0.0-3.tgz#ab6df4bf6caaa6c85a59f6e82c026151d4bb376b"
+  integrity sha512-HoKuzZrUlgpz35YO27XgD28uh/WJH4B0+3ttFqRo//lmq+9T/mIOJ6kqmINI9HpUpz1imRC/nR/lxKpJiv0uig==
+  dependencies:
+    buffer "^5.4.3"
+    punycode "^2.1.1"
+    webidl-conversions "^5.0.0"
+
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -7274,6 +7585,11 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
+ws@7.4.6:
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+
 ws@^6.2.1:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
@@ -7286,6 +7602,11 @@ ws@^7.4.5:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
   integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
 
+ws@^8.5.0:
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0"
+  integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==
+
 y18n@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
@@ -7330,6 +7651,14 @@ yarn@^1.22.18:
   resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.18.tgz#05b822ade8c672987bab8858635145da0850f78a"
   integrity sha512-oFffv6Jp2+BTUBItzx1Z0dpikTX+raRdqupfqzeMKnoh7WD6RuPAxcqDkMUy9vafJkrB0YaV708znpuMhEBKGQ==
 
+yauzl@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
+  dependencies:
+    buffer-crc32 "~0.2.3"
+    fd-slicer "~1.1.0"
+
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"

From 63fea74d95f7710a9dd81be6f403cff770c03ea3 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Fri, 5 Aug 2022 11:04:18 +0200
Subject: [PATCH 090/101] build(governance): remove package

---
 package.json          |   7 +-
 pages/api/og-image.ts |  18 ----
 yarn.lock             | 210 +++---------------------------------------
 3 files changed, 17 insertions(+), 218 deletions(-)
 delete mode 100644 pages/api/og-image.ts

diff --git a/package.json b/package.json
index eaee1a4f..ffac9f53 100644
--- a/package.json
+++ b/package.json
@@ -44,13 +44,12 @@
     "@vanilla-extract/next-plugin": "^2.0.1",
     "@vanilla-extract/sprinkles": "^1.4.0",
     "bn.js": "^5.2.0",
-    "date-fns": "^2.28.0",
     "chrome-aws-lambda": "^10.1.0",
+    "date-fns": "^2.28.0",
     "degen": "^0.0.69",
     "jsbi": "^4.3.0",
     "next": "12.1.0",
     "pluralize": "^8.0.0",
-    "next-api-og-image": "^4.0.1",
     "react": "17.0.2",
     "react-countdown": "^2.3.2",
     "react-dom": "17.0.2",
@@ -59,9 +58,9 @@
     "react-query": "^3.39.0",
     "react-toastify": "^8.2.0",
     "recharts": "^2.1.9",
+    "swr": "^1.3.0",
     "yarn": "^1.22.18",
-    "yup": "^0.32.11",
-    "swr": "^1.3.0"
+    "yup": "^0.32.11"
   },
   "devDependencies": {
     "@types/node": "17.0.21",
diff --git a/pages/api/og-image.ts b/pages/api/og-image.ts
deleted file mode 100644
index 519e610c..00000000
--- a/pages/api/og-image.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// pages/api/og-image.ts
-import { withOGImage } from 'next-api-og-image';
-
-interface QueryParams {
-  stage: string;
-  name: string;
-}
-
-export default withOGImage<'query', QueryParams>({
-  template: {
-                                // include HTML template here
-    html: ({ name, stage }) =>  `<h1>${name} - ${stage}</h1>`,
-  },
-  cacheControl: 'public, max-age=604800, immutable',
-  dev: {
-    inspectHtml: false,
-  },
-}); 
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index bede3cac..5cdfd1cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1444,13 +1444,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/yauzl@^2.9.1":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599"
-  integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==
-  dependencies:
-    "@types/node" "*"
-
 "@typescript-eslint/parser@^5.0.0":
   version "5.16.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.16.0.tgz#e4de1bde4b4dad5b6124d3da227347616ed55508"
@@ -1620,13 +1613,6 @@ acorn@^8.7.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
   integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
 
-agent-base@6:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
-
 ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
@@ -2097,11 +2083,6 @@ bs58check@<3.0.0, bs58check@^2.1.1:
     create-hash "^1.1.0"
     safe-buffer "^5.1.2"
 
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
-
 buffer-indexof@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
@@ -2128,7 +2109,7 @@ buffer@6.0.3, buffer@^6.0.3, buffer@~6.0.3:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
-buffer@^5.2.1, buffer@^5.4.3, buffer@^5.5.0:
+buffer@^5.4.3, buffer@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -2617,20 +2598,6 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-debug@4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
-  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
-  dependencies:
-    ms "2.1.2"
-
 debug@^3.1.1, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -2638,6 +2605,13 @@ debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -2790,11 +2764,6 @@ detect-node@^2.0.4, detect-node@^2.1.0:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-devtools-protocol@0.0.901419:
-  version "0.0.901419"
-  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz#79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd"
-  integrity sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==
-
 diff@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
@@ -3379,17 +3348,6 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-zip@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
-  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
-  dependencies:
-    debug "^4.1.1"
-    get-stream "^5.1.0"
-    yauzl "^2.10.0"
-  optionalDependencies:
-    "@types/yauzl" "^2.9.1"
-
 eyes@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
@@ -3450,13 +3408,6 @@ faye-websocket@^0.11.3, faye-websocket@^0.11.4:
   dependencies:
     websocket-driver ">=0.5.1"
 
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
-  dependencies:
-    pend "~1.2.0"
-
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -3518,7 +3469,7 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^4.0.0, find-up@^4.1.0:
+find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -3621,15 +3572,6 @@ fs-extra@^7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^8.0.1:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -3689,13 +3631,6 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
-
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -3795,7 +3730,7 @@ graceful-fs@^4.1.11:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
   integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -3978,14 +3913,6 @@ http-proxy@^1.17.0:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-https-proxy-agent@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -4501,15 +4428,6 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonfile@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-5.0.0.tgz#e6b718f73da420d612823996fdf14a03f6ff6922"
-  integrity sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==
-  dependencies:
-    universalify "^0.1.2"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -5199,15 +5117,6 @@ negotiator@0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
-next-api-og-image@^4.0.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/next-api-og-image/-/next-api-og-image-4.2.1.tgz#8e61dd490da4ac79b6db1269d132e6e6308f4d7d"
-  integrity sha512-I6PwEBLadD2zzXnfjNIXNCCx9N8DKSIMFNiaCidJadSUGwmY4/8MotooMJdahuUk6kAcgMnli7XfiuLAsTKEpw==
-  dependencies:
-    deepmerge "^4.2.2"
-    puppeteer-core "^10.4.0"
-    twemoji "^13.1.0"
-
 next@12.1.0:
   version "12.1.0"
   resolved "https://registry.yarnpkg.com/next/-/next-12.1.0.tgz#c33d753b644be92fc58e06e5a214f143da61dd5d"
@@ -5256,11 +5165,6 @@ node-fetch@2, node-fetch@2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
-  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
-
 node-forge@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
@@ -5646,11 +5550,6 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -5688,13 +5587,6 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkg-dir@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
-  dependencies:
-    find-up "^4.0.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -5769,11 +5661,6 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-progress@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31"
-  integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==
-
 promise-retry@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
@@ -5809,11 +5696,6 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
-proxy-from-env@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -5837,24 +5719,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-puppeteer-core@^10.4.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-10.4.0.tgz#4e2da57c52339b8c07cd9362922020eb3c3c95bf"
-  integrity sha512-KU8zyb7AIOqNjLCN3wkrFXxh+EVaG+zrs2P03ATNjc3iwSxHsu5/EvZiREpQ/IJiT9xfQbDVgKcsvRuzLCxglQ==
-  dependencies:
-    debug "4.3.1"
-    devtools-protocol "0.0.901419"
-    extract-zip "2.0.1"
-    https-proxy-agent "5.0.0"
-    node-fetch "2.6.1"
-    pkg-dir "4.2.0"
-    progress "2.0.1"
-    proxy-from-env "1.1.0"
-    rimraf "3.0.2"
-    tar-fs "2.0.0"
-    unbzip2-stream "1.3.3"
-    ws "7.4.6"
-
 qs@6.9.7:
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
@@ -6907,7 +6771,7 @@ swr@^1.3.0:
   resolved "https://registry.yarnpkg.com/swr/-/swr-1.3.0.tgz#c6531866a35b4db37b38b72c45a63171faf9f4e8"
   integrity sha512-dkghQrOl2ORX9HYrMDtPa7LTVHJjCTeZoB1dqTbnnEDlSvN8JEKpYIYurDfvbQFUUS8Cg8PceFVZNkW0KNNYPw==
 
-tar-fs@*:
+tar-fs@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
   integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
@@ -6917,17 +6781,7 @@ tar-fs@*:
     pump "^3.0.0"
     tar-stream "^2.1.4"
 
-tar-fs@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad"
-  integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==
-  dependencies:
-    chownr "^1.1.1"
-    mkdirp "^0.5.1"
-    pump "^3.0.0"
-    tar-stream "^2.0.0"
-
-tar-stream@^2.0.0, tar-stream@^2.1.4:
+tar-stream@^2.1.4:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
   integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
@@ -6948,7 +6802,7 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-"through@>=2.2.7 <3", through@^2.3.8:
+"through@>=2.2.7 <3":
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -7090,21 +6944,6 @@ tweetnacl@^1.0.0, tweetnacl@^1.0.3:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
   integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
 
-twemoji-parser@13.1.0:
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/twemoji-parser/-/twemoji-parser-13.1.0.tgz#65e7e449c59258791b22ac0b37077349127e3ea4"
-  integrity sha512-AQOzLJpYlpWMy8n+0ATyKKZzWlZBJN+G0C+5lhX7Ftc2PeEVdUU/7ns2Pn2vVje26AIZ/OHwFoUbdv6YYD/wGg==
-
-twemoji@^13.1.0:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/twemoji/-/twemoji-13.1.1.tgz#6e31409908bb5383cdb1d09c9c8e7856aa6e2e3b"
-  integrity sha512-IIIoq+n1lk1M1+evBKZD3DO0ud02fDQ4ssbgAv8rp3YBWUeNmskjlisFUPPDacQ50XS3bhrd4Kq9Q2gqhxb0dg==
-  dependencies:
-    fs-extra "^8.0.1"
-    jsonfile "^5.0.0"
-    twemoji-parser "13.1.0"
-    universalify "^0.1.2"
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -7160,14 +6999,6 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
-unbzip2-stream@1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a"
-  integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==
-  dependencies:
-    buffer "^5.2.1"
-    through "^2.3.8"
-
 unified@^10.0.0:
   version "10.1.2"
   resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.2.tgz#b1d64e55dafe1f0b98bb6c719881103ecf6c86df"
@@ -7256,7 +7087,7 @@ unist-util-visit@^4.0.0:
     unist-util-is "^5.0.0"
     unist-util-visit-parents "^5.0.0"
 
-universalify@^0.1.0, universalify@^0.1.2:
+universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
@@ -7585,11 +7416,6 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-ws@7.4.6:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
-  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
-
 ws@^6.2.1:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
@@ -7651,14 +7477,6 @@ yarn@^1.22.18:
   resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.18.tgz#05b822ade8c672987bab8858635145da0850f78a"
   integrity sha512-oFffv6Jp2+BTUBItzx1Z0dpikTX+raRdqupfqzeMKnoh7WD6RuPAxcqDkMUy9vafJkrB0YaV708znpuMhEBKGQ==
 
-yauzl@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
-
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"

From b7aaf6df5d8d9ddfebcfdcffca86fd5f5b6817e3 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Sat, 13 Aug 2022 11:05:45 +0200
Subject: [PATCH 091/101] feat(governance): add

---
 components/HoneyModal/HoneyModal.tsx     |  68 ++--------
 components/PHoneyModal/PHoneyModal.tsx   |  20 +--
 components/VeHoneyModal/VeHoneyModal.tsx |  65 ++--------
 contexts/.gitkeep                        |   0
 contexts/GovernanceProvider.tsx          | 158 +++++++++++++++++++++++
 pages/_app.tsx                           |  56 ++++----
 pages/governance/index.tsx               |  64 +--------
 7 files changed, 218 insertions(+), 213 deletions(-)
 delete mode 100644 contexts/.gitkeep
 create mode 100644 contexts/GovernanceProvider.tsx

diff --git a/components/HoneyModal/HoneyModal.tsx b/components/HoneyModal/HoneyModal.tsx
index b2849cf2..c7a35c8f 100644
--- a/components/HoneyModal/HoneyModal.tsx
+++ b/components/HoneyModal/HoneyModal.tsx
@@ -12,11 +12,20 @@ import {
   convertBnTimestampToDate,
   calcVeHoneyAmount
 } from 'helpers/utils';
+import { useGovernance } from 'contexts/GovernanceProvider';
 
 const HoneyModal = () => {
   const [amount, setAmount] = useState<number>(0);
   const [vestingPeriod, setVestingPeriod] = useState<number>(12);
 
+  const {
+    veHoneyAmount,
+    lockedAmount,
+    lockedPeriodEnd,
+    honeyAmount,
+    lockPeriodHasEnded
+  } = useGovernance();
+
   const handleOnChange = (event: any) => {
     setAmount(event.target.value);
   };
@@ -33,10 +42,7 @@ const HoneyModal = () => {
     return 0;
   }, [vestingPeriod]);
 
-  const { tokenAccounts } = useAccounts();
-
   // ======================== Should replace with configuration ================
-  const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
   const STAKE_POOL_ADDRESS = new PublicKey(
     process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
       '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
@@ -49,59 +55,9 @@ const HoneyModal = () => {
 
   const { lock, unlock, escrow } = useStake(STAKE_POOL_ADDRESS, LOCKER_ADDRESS);
 
-  const lockedAmount = useMemo(() => {
-    if (!escrow) {
-      return 0;
-    }
-
-    return convert(escrow.amount, HONEY_DECIMALS);
-  }, [escrow]);
-
-  const lockedPeriodEnd = useMemo(() => {
-    if (!escrow) {
-      return 0;
-    }
-
-    return convertBnTimestampToDate(escrow.escrowEndsAt);
-  }, [escrow]);
-
-  const lockPeriodHasEnded = useMemo((): boolean => {
-    if (!escrow) {
-      return true;
-    }
-    const lockEndsTimestamp = convert(escrow.escrowEndsAt, 0);
-    const currentTimestamp = new Date().getTime();
-
-    if (lockEndsTimestamp  >= currentTimestamp) {
-      return true;
-    }
-    return false;
-  }, [escrow]);
-
-  const veHoneyAmount = useMemo(() => {
-    if (!escrow) {
-      return 0;
-    }
-    return calcVeHoneyAmount(
-      escrow.escrowStartedAt,
-      escrow.escrowEndsAt,
-      escrow.amount
-    );
-  }, [escrow]);
-
-  const HoneyAmount = useMemo(() => {
-    if (!honeyToken) {
-      return 0;
-    }
-
-    return convert(honeyToken.info.amount, HONEY_DECIMALS);
-  }, [honeyToken]);
-
   const handleLock = useCallback(async () => {
     if (!amount || !vestingPeriodInSeconds) return;
 
-    // console.log(vestingPeriodInSeconds);
-
     await lock(
       convertToBN(amount, HONEY_DECIMALS),
       new anchor.BN(vestingPeriodInSeconds),
@@ -165,11 +121,11 @@ const HoneyModal = () => {
           <Input
             type="number"
             label="Amount"
-            labelSecondary={<Tag>{HoneyAmount} pHONEY max</Tag>}
-            max={HoneyAmount || ''}
+            labelSecondary={<Tag>{honeyAmount} pHONEY max</Tag>}
+            max={honeyAmount || ''}
             min={0}
             value={amount || ''}
-            disabled={!HoneyAmount}
+            disabled={!honeyAmount}
             hideLabel
             units="HONEY"
             placeholder="0"
diff --git a/components/PHoneyModal/PHoneyModal.tsx b/components/PHoneyModal/PHoneyModal.tsx
index 3e67cdfd..2be17fa5 100644
--- a/components/PHoneyModal/PHoneyModal.tsx
+++ b/components/PHoneyModal/PHoneyModal.tsx
@@ -5,6 +5,7 @@ import { useStake } from 'hooks/useStake';
 import { useAccounts } from 'hooks/useAccounts';
 import { PHONEY_DECIMALS, PHONEY_MINT } from 'helpers/sdk/constant';
 import { convert, convertToBN } from 'helpers/utils';
+import { useGovernance } from 'contexts/GovernanceProvider';
 
 // console.log("The stake pool address is : ", process.env.PUBLIC_NEXT_PUBLIC_STAKE_POOL_ADDRESS)
 const PHoneyModal = () => {
@@ -17,10 +18,9 @@ const PHoneyModal = () => {
     setAmount(Number(event.target.value));
   };
 
-  const { tokenAccounts } = useAccounts();
+  const { depositedAmount, pHoneyAmount } = useGovernance();
 
   // ======================== Should replace with configuration ================
-  const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
   const STAKE_POOL_ADDRESS = new PublicKey(
     process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
       '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
@@ -40,22 +40,6 @@ const PHoneyModal = () => {
     setIsClaimable(claimableAmount !== 0);
   }, [claimableAmount]);
 
-  const depositedAmount = useMemo(() => {
-    if (!user) {
-      return 0;
-    }
-
-    return convert(user.depositAmount, PHONEY_DECIMALS);
-  }, [user]);
-
-  const pHoneyAmount = useMemo(() => {
-    if (!pHoneyToken) {
-      return 0;
-    }
-
-    return convert(pHoneyToken.info.amount, PHONEY_DECIMALS);
-  }, [pHoneyToken]);
-
   const handleDeposit = useCallback(async () => {
     if (!amount) return;
 
diff --git a/components/VeHoneyModal/VeHoneyModal.tsx b/components/VeHoneyModal/VeHoneyModal.tsx
index 83e3da0f..4393e56e 100644
--- a/components/VeHoneyModal/VeHoneyModal.tsx
+++ b/components/VeHoneyModal/VeHoneyModal.tsx
@@ -17,6 +17,7 @@ import {
   convertBnTimestampToDate,
   calcVeHoneyAmount
 } from 'helpers/utils';
+import { useGovernance } from 'contexts/GovernanceProvider';
 
 const VeHoneyModal = () => {
   const [amount, setAmount] = useState<number>(0);
@@ -24,6 +25,14 @@ const VeHoneyModal = () => {
   const [pHoneyConversionAmount, setPHoneyConversionAmount] =
     useState<number>(0);
 
+  const {
+    veHoneyAmount,
+    lockedAmount,
+    lockedPeriodEnd,
+    pHoneyAmount,
+    lockPeriodHasEnded
+  } = useGovernance();
+
   const handleOnChange = (event: any) => {
     setAmount(event.target.value);
   };
@@ -50,10 +59,7 @@ const VeHoneyModal = () => {
     return 0;
   }, [vestingPeriod]);
 
-  const { tokenAccounts } = useAccounts();
-
   // ======================== Should replace with configuration ================
-  const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
   const STAKE_POOL_ADDRESS = new PublicKey(
     process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
       '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
@@ -69,60 +75,9 @@ const VeHoneyModal = () => {
     LOCKER_ADDRESS
   );
 
-  const lockedAmount = useMemo(() => {
-    if (!escrow) {
-      return 0;
-    }
-
-    return convert(escrow.amount, HONEY_DECIMALS);
-  }, [escrow]);
-
-  const lockedPeriodEnd = useMemo(() => {
-    if (!escrow) {
-      return 0;
-    }
-
-    return convertBnTimestampToDate(escrow.escrowEndsAt);
-  }, [escrow]);
-
-  const lockPeriodHasEnded = useMemo((): boolean => {
-    if (!escrow) {
-      return true;
-    }
-    const lockEndsTimestamp = convert(escrow.escrowEndsAt, 0);
-    const currentTimestamp = new Date().getTime();
-
-    if (lockEndsTimestamp <= currentTimestamp) {
-      return false;
-    }
-    return true;
-  }, [escrow]);
-
-  // console.log(new Date().getTime())
-
-  const veHoneyAmount = useMemo(() => {
-    if (!escrow) {
-      return 0;
-    }
-    return calcVeHoneyAmount(
-      escrow.escrowStartedAt,
-      escrow.escrowEndsAt,
-      escrow.amount
-    );
-  }, [escrow]);
-
-  const pHoneyAmount = useMemo(() => {
-    if (!pHoneyToken) {
-      return 0;
-    }
-
-    return convert(pHoneyToken.info.amount, PHONEY_DECIMALS);
-  }, [pHoneyToken]);
-
   const handleStake = useCallback(async () => {
     if (!amount || !vestingPeriodInSeconds) return;
 
-
     await stake(
       convertToBN(amount, PHONEY_DECIMALS),
       new anchor.BN(vestingPeriodInSeconds),
@@ -222,7 +177,7 @@ const VeHoneyModal = () => {
           >
             {amount ? 'Deposit' : 'Enter amount'}
           </Button>
-          <Button onClick={unlock}  disabled={lockPeriodHasEnded} width="full">
+          <Button onClick={unlock} disabled={lockPeriodHasEnded} width="full">
             Unlock
           </Button>
         </Stack>
diff --git a/contexts/.gitkeep b/contexts/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/contexts/GovernanceProvider.tsx b/contexts/GovernanceProvider.tsx
new file mode 100644
index 00000000..80282048
--- /dev/null
+++ b/contexts/GovernanceProvider.tsx
@@ -0,0 +1,158 @@
+import { calcVeHoneyAmount, convert, convertBnTimestampToDate } from "helpers/utils";
+import { createContext, useContext, ReactNode, useState, useMemo } from "react";
+import { PublicKey } from '@solana/web3.js';
+import { useStake } from 'hooks/useStake';
+import { HONEY_DECIMALS, HONEY_MINT, PHONEY_DECIMALS, PHONEY_MINT } from "helpers/sdk";
+import { useAccounts } from "hooks/useAccounts";
+
+type govContextType = {
+
+    veHoneyAmount: number;
+    lockedAmount: number;
+    lockedPeriodEnd:string | number;
+    pHoneyAmount: number;
+    honeyAmount: number;
+    depositedAmount: number;
+    lockPeriodHasEnded: boolean;
+};
+
+const govContextDefaultValues: govContextType = {
+
+    veHoneyAmount: 0,
+    lockedAmount: 0,
+    lockedPeriodEnd: "",
+    pHoneyAmount: 0,
+    honeyAmount: 0,
+    depositedAmount: 0,
+    lockPeriodHasEnded: false
+};
+
+const GovContext = createContext<govContextType>(govContextDefaultValues);
+
+export function useGovernance() {
+    return useContext(GovContext);
+}
+
+type Props = {
+    children: ReactNode;
+};
+
+export function GovernanceProvider({ children }: Props) {
+  
+    const STAKE_POOL_ADDRESS = new PublicKey(
+        process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
+          'Cv9Hx3VRvqkz5JRPiZM8A2BH31yvpcT4qiUJLdtgu7TE'
+      );
+      const LOCKER_ADDRESS = new PublicKey(
+        process.env.NEXT_PUBLIC_LOCKER_ADDR ||
+          '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
+      );
+      // ============================================================================
+    
+      const { user, escrow, totalVeHoney } = useStake(
+        STAKE_POOL_ADDRESS,
+        LOCKER_ADDRESS
+      );
+    
+    // use token accounts for honey and phoney
+    const { tokenAccounts } = useAccounts();
+    // ======================== Should replace with configuration ================
+    const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
+    const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
+  
+
+    // calculate user veHONEY amount locked
+    const veHoneyAmount = useMemo(() => {
+        if (!escrow) {
+          return 0;
+        }
+        return calcVeHoneyAmount(
+          escrow.escrowStartedAt,
+          escrow.escrowEndsAt,
+          escrow.amount
+        );
+      }, [escrow]);
+
+    //  
+      const lockedAmount = useMemo(() => {
+        if (!escrow) {
+          return 0;
+        }
+    
+        return convert(escrow.amount, HONEY_DECIMALS);
+      }, [escrow]);
+    
+    // locked period end date
+    const lockedPeriodEnd = useMemo(() => {
+      if (!escrow) {
+        return 0;
+      }
+  
+      return convertBnTimestampToDate(escrow.escrowEndsAt);
+    }, [escrow]);
+
+    // pHONEY amount deposited
+    const pHoneyAmount = useMemo(() => {
+      if (!pHoneyToken) {
+        return 0;
+      }
+  
+      return convert(pHoneyToken.info.amount, PHONEY_DECIMALS);
+    }, [pHoneyToken]);
+
+    // HONEY amount deposited
+    const honeyAmount = useMemo(() => {
+      if (!honeyToken) {
+        return 0;
+      }
+  
+      return convert(honeyToken.info.amount, HONEY_DECIMALS);
+    }, [honeyToken]);
+    
+    // amount of pHoney deposited by user
+    const depositedAmount = useMemo(() => {
+      if (!user) {
+        return 0;
+      }
+  
+      return convert(user.depositAmount, PHONEY_DECIMALS);
+    }, [user]);
+    
+    // locked period has ended 
+
+    const lockPeriodHasEnded = useMemo((): boolean => {
+      if (!escrow) {
+        return true;
+      }
+      const lockEndsTimestamp = convert(escrow.escrowEndsAt, 0);
+      const currentTimestamp = new Date().getTime();
+  
+      if (lockEndsTimestamp >= currentTimestamp) {
+        return true;
+      }
+      return false;
+    }, [escrow]);
+
+  
+    
+    // the data that's passed to the provider 
+    const value = {
+ 
+        veHoneyAmount,
+        lockedAmount,
+        lockedPeriodEnd,
+        pHoneyAmount,
+        honeyAmount,
+        depositedAmount,
+        lockPeriodHasEnded
+
+    };
+
+    return (
+        <>
+            <GovContext.Provider value={value}>
+                {children}
+            </GovContext.Provider>
+        </>
+    );
+}
\ No newline at end of file
diff --git a/pages/_app.tsx b/pages/_app.tsx
index a058024a..0eb054fd 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -18,6 +18,7 @@ import {
   SDKProvider
 } from 'helpers/sdk';
 import { GovernorProvider } from 'hooks/tribeca/useGovernor';
+import { GovernanceProvider } from 'contexts/GovernanceProvider';
 
 import 'degen/styles';
 import '../styles/globals.css';
@@ -74,6 +75,7 @@ function MyApp({ Component, pageProps }: AppProps) {
       </Script>
       <QueryClientProvider client={queryClient}>
         <ReactQueryDevtools initialIsOpen={false} />
+
         <WalletKitProvider
           defaultNetwork={network}
           app={{
@@ -81,32 +83,34 @@ function MyApp({ Component, pageProps }: AppProps) {
           }}
           networkConfigs={networkConfiguration()}
         >
-          <SailProvider
-            initialState={{
-              onSailError
-            }}
-          >
-            <SDKProvider>
-              <GovernorProvider
-                initialState={{
-                  governor: GOVERNOR_ADDRESS,
-                  govToken: HONEY_MINT,
-                  minter: {
-                    mintWrapper: HONEY_MINT_WRAPPER
-                  }
-                }}
-              >
-                {/* {children} */}
-                {showPopup ? (
-                  <SecPopup setShowPopup={setShowPopup} />
-                ) : (
-                  <>
-                    <Component {...pageProps} />
-                  </>
-                )}
-              </GovernorProvider>
-            </SDKProvider>
-          </SailProvider>
+          <GovernanceProvider>
+            <SailProvider
+              initialState={{
+                onSailError
+              }}
+            >
+              <SDKProvider>
+                <GovernorProvider
+                  initialState={{
+                    governor: GOVERNOR_ADDRESS,
+                    govToken: HONEY_MINT,
+                    minter: {
+                      mintWrapper: HONEY_MINT_WRAPPER
+                    }
+                  }}
+                >
+                  {/* {children} */}
+                  {showPopup ? (
+                    <SecPopup setShowPopup={setShowPopup} />
+                  ) : (
+                    <>
+                      <Component {...pageProps} />
+                    </>
+                  )}
+                </GovernorProvider>
+              </SDKProvider>
+            </SailProvider>
+          </GovernanceProvider>
         </WalletKitProvider>
       </QueryClientProvider>
       <ToastContainer theme="dark" position="bottom-right" />
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 189efdc8..a9e08c84 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -23,7 +23,7 @@ import { PublicKey } from '@solana/web3.js';
 import { useConnectedWallet } from '@saberhq/use-solana';
 import { useWalletKit } from '@gokiprotocol/walletkit';
 import NumberFormat from 'react-number-format';
-import { useStake } from 'hooks/useStake';
+  import { useStake } from 'hooks/useStake';
 import { useAccounts } from 'hooks/useAccounts';
 import {
   PHONEY_DECIMALS,
@@ -43,6 +43,7 @@ import { useTokenAmount, useTokenMint } from '@saberhq/sail';
 import { useGovernor } from 'hooks/tribeca/useGovernor';
 import { TokenAmount } from '@saberhq/token-utils';
 import ToolTip from 'components/ToolTip/ToolTip';
+import { useGovernance } from 'contexts/GovernanceProvider';
 
 const Governance: NextPage = () => {
   const wallet = useConnectedWallet();
@@ -52,14 +53,11 @@ const Governance: NextPage = () => {
   const [showHoneyModal, setShowHoneyModal] = useState(false);
   const [vehoneySupply, setVehoneySupply] = useState("");
 
-  const { tokenAccounts } = useAccounts();
-  // ======================== Should replace with configuration ================
-  const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
-  const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
 
   const { govToken, veToken, lockedSupply } = useGovernor();
+  
+  const { veHoneyAmount, lockedAmount, lockedPeriodEnd, pHoneyAmount, honeyAmount, depositedAmount } = useGovernance();
 
-  // const totalVeTokens = useTokenAmount(veToken, '0');
   const { data: govTokenData } = useTokenMint(govToken?.mintAccount);
   const totalSupplyFmt =
     govTokenData && govToken
@@ -88,7 +86,7 @@ const Governance: NextPage = () => {
   );
   // ============================================================================
 
-  const { user, escrow, totalVeHoney } = useStake(
+  const { totalVeHoney } = useStake(
     STAKE_POOL_ADDRESS,
     LOCKER_ADDRESS
   );
@@ -104,56 +102,6 @@ const Governance: NextPage = () => {
     getVeHoneySupply()
   }, [getVeHoneySupply, totalVeHoney])
 
-  const lockedAmount = useMemo(() => {
-    if (!escrow) {
-      return 0;
-    }
-
-    return convert(escrow.amount, HONEY_DECIMALS);
-  }, [escrow]);
-
-  const lockedPeriodEnd = useMemo(() => {
-    if (!escrow) {
-      return 0;
-    }
-
-    return convertBnTimestampToDate(escrow.escrowEndsAt);
-  }, [escrow]);
-
-  const veHoneyAmount = useMemo(() => {
-    if (!escrow) {
-      return 0;
-    }
-    return calcVeHoneyAmount(
-      escrow.escrowStartedAt,
-      escrow.escrowEndsAt,
-      escrow.amount
-    );
-  }, [escrow]);
-
-  const depositedAmount = useMemo(() => {
-    if (!user) {
-      return 0;
-    }
-
-    return convert(user.depositAmount, PHONEY_DECIMALS);
-  }, [user]);
-
-  const pHoneyAmount = useMemo(() => {
-    if (!pHoneyToken) {
-      return 0;
-    }
-
-    return convert(pHoneyToken.info.amount, PHONEY_DECIMALS);
-  }, [pHoneyToken]);
-
-  const honeyAmount = useMemo(() => {
-    if (!honeyToken) {
-      return 0;
-    }
-
-    return convert(honeyToken.info.amount, HONEY_DECIMALS);
-  }, [honeyToken]);
 
   return (
     <Layout>
@@ -309,7 +257,7 @@ const Governance: NextPage = () => {
                           <Text size="small">{lockedPeriodEnd}</Text>
                         </Stack>
                         <Stack justify="space-between" direction="horizontal">
-                          <Text size="small">pHONEY deposited:</Text>
+                          <Text size="small">pHONEY deposited</Text>
                           <Text size="small">{depositedAmount}</Text>
                         </Stack>
                         <Stack justify="space-between" direction="horizontal">

From b599953029ed0947dd7afa37b9e8e5e921df890a Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Tue, 16 Aug 2022 11:41:30 +0200
Subject: [PATCH 092/101] refactor(governance): remove unused imports

---
 components/HoneyModal/HoneyModal.tsx     | 10 +---
 components/PHoneyModal/PHoneyModal.tsx   |  7 ++-
 components/VeHoneyModal/VeHoneyModal.tsx | 15 +-----
 contexts/GovernanceProvider.tsx          |  7 ---
 pages/governance/index.tsx               | 68 ++++++++----------------
 5 files changed, 30 insertions(+), 77 deletions(-)

diff --git a/components/HoneyModal/HoneyModal.tsx b/components/HoneyModal/HoneyModal.tsx
index c7a35c8f..e59e8c0e 100644
--- a/components/HoneyModal/HoneyModal.tsx
+++ b/components/HoneyModal/HoneyModal.tsx
@@ -4,14 +4,8 @@ import { PublicKey } from '@solana/web3.js';
 import * as anchor from '@project-serum/anchor';
 import * as styles from './HoneyModal.css';
 import { useStake } from 'hooks/useStake';
-import { useAccounts } from 'hooks/useAccounts';
-import { HONEY_DECIMALS, HONEY_MINT } from 'helpers/sdk/constant';
-import {
-  convert,
-  convertToBN,
-  convertBnTimestampToDate,
-  calcVeHoneyAmount
-} from 'helpers/utils';
+import { HONEY_DECIMALS } from 'helpers/sdk/constant';
+import { convertToBN } from 'helpers/utils';
 import { useGovernance } from 'contexts/GovernanceProvider';
 
 const HoneyModal = () => {
diff --git a/components/PHoneyModal/PHoneyModal.tsx b/components/PHoneyModal/PHoneyModal.tsx
index 2be17fa5..c8380c1b 100644
--- a/components/PHoneyModal/PHoneyModal.tsx
+++ b/components/PHoneyModal/PHoneyModal.tsx
@@ -1,10 +1,9 @@
-import React, { useCallback, useMemo, useState, useEffect } from 'react';
+import React, { useCallback, useState, useEffect } from 'react';
 import { Box, Button, Input, Stack, Text, Tag } from 'degen';
 import { PublicKey } from '@solana/web3.js';
 import { useStake } from 'hooks/useStake';
-import { useAccounts } from 'hooks/useAccounts';
-import { PHONEY_DECIMALS, PHONEY_MINT } from 'helpers/sdk/constant';
-import { convert, convertToBN } from 'helpers/utils';
+import { PHONEY_DECIMALS } from 'helpers/sdk/constant';
+import { convertToBN } from 'helpers/utils';
 import { useGovernance } from 'contexts/GovernanceProvider';
 
 // console.log("The stake pool address is : ", process.env.PUBLIC_NEXT_PUBLIC_STAKE_POOL_ADDRESS)
diff --git a/components/VeHoneyModal/VeHoneyModal.tsx b/components/VeHoneyModal/VeHoneyModal.tsx
index 4393e56e..6ebbec6d 100644
--- a/components/VeHoneyModal/VeHoneyModal.tsx
+++ b/components/VeHoneyModal/VeHoneyModal.tsx
@@ -2,21 +2,10 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Box, Button, Input, Stack, Text, Tag } from 'degen';
 import { PublicKey } from '@solana/web3.js';
 import * as anchor from '@project-serum/anchor';
-
 import * as styles from './VeHoneyModal.css';
 import { useStake } from 'hooks/useStake';
-import { useAccounts } from 'hooks/useAccounts';
-import {
-  HONEY_DECIMALS,
-  PHONEY_DECIMALS,
-  PHONEY_MINT
-} from 'helpers/sdk/constant';
-import {
-  convert,
-  convertToBN,
-  convertBnTimestampToDate,
-  calcVeHoneyAmount
-} from 'helpers/utils';
+import { PHONEY_DECIMALS } from 'helpers/sdk/constant';
+import { convertToBN } from 'helpers/utils';
 import { useGovernance } from 'contexts/GovernanceProvider';
 
 const VeHoneyModal = () => {
diff --git a/contexts/GovernanceProvider.tsx b/contexts/GovernanceProvider.tsx
index 80282048..613b3364 100644
--- a/contexts/GovernanceProvider.tsx
+++ b/contexts/GovernanceProvider.tsx
@@ -38,7 +38,6 @@ type Props = {
 };
 
 export function GovernanceProvider({ children }: Props) {
-  
     const STAKE_POOL_ADDRESS = new PublicKey(
         process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
           'Cv9Hx3VRvqkz5JRPiZM8A2BH31yvpcT4qiUJLdtgu7TE'
@@ -60,7 +59,6 @@ export function GovernanceProvider({ children }: Props) {
     const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
     const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
   
-
     // calculate user veHONEY amount locked
     const veHoneyAmount = useMemo(() => {
         if (!escrow) {
@@ -119,7 +117,6 @@ export function GovernanceProvider({ children }: Props) {
     }, [user]);
     
     // locked period has ended 
-
     const lockPeriodHasEnded = useMemo((): boolean => {
       if (!escrow) {
         return true;
@@ -133,11 +130,8 @@ export function GovernanceProvider({ children }: Props) {
       return false;
     }, [escrow]);
 
-  
-    
     // the data that's passed to the provider 
     const value = {
- 
         veHoneyAmount,
         lockedAmount,
         lockedPeriodEnd,
@@ -145,7 +139,6 @@ export function GovernanceProvider({ children }: Props) {
         honeyAmount,
         depositedAmount,
         lockPeriodHasEnded
-
     };
 
     return (
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index a9e08c84..146e1775 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -1,21 +1,11 @@
 import type { NextPage } from 'next';
 import HeadSeo from 'components/HeadSeo/HeadSeo';
 import siteMetadata from 'constants/siteMetadata';
-import {
-  Box,
-  Button,
-  Card,
-  IconChevronRight,
-  IconExclamation,
-  Input,
-  Tag,
-  Stat,
-  Text
-} from 'degen';
+import { Box, Button, Card, IconExclamation, Stat, Text } from 'degen';
 import { Stack } from 'degen';
 import Layout from '../../components/Layout/Layout';
 import ModalContainer from 'components/ModalContainer/ModalContainer';
-import { useState, useMemo, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 import PHoneyModal from 'components/PHoneyModal/PHoneyModal';
 import VeHoneyModal from 'components/VeHoneyModal/VeHoneyModal';
 import HoneyModal from 'components/HoneyModal/HoneyModal';
@@ -23,23 +13,10 @@ import { PublicKey } from '@solana/web3.js';
 import { useConnectedWallet } from '@saberhq/use-solana';
 import { useWalletKit } from '@gokiprotocol/walletkit';
 import NumberFormat from 'react-number-format';
-  import { useStake } from 'hooks/useStake';
-import { useAccounts } from 'hooks/useAccounts';
-import {
-  PHONEY_DECIMALS,
-  PHONEY_MINT,
-  HONEY_MINT,
-  HONEY_DECIMALS
-} from 'helpers/sdk/constant';
-import {
-  convert,
-  convertToBN,
-  convertBnTimestampToDate,
-  calcVeHoneyAmount
-} from 'helpers/utils';
+import { useStake } from 'hooks/useStake';
 import { ProposalsList } from 'components/Proposals/ProposalsList';
 import { Card as ProposalContainer } from 'components/common/governance/Card';
-import { useTokenAmount, useTokenMint } from '@saberhq/sail';
+import { useTokenMint } from '@saberhq/sail';
 import { useGovernor } from 'hooks/tribeca/useGovernor';
 import { TokenAmount } from '@saberhq/token-utils';
 import ToolTip from 'components/ToolTip/ToolTip';
@@ -51,14 +28,21 @@ const Governance: NextPage = () => {
   const [showPHoneyModal, setShowPHoneyModal] = useState(false);
   const [showVeHoneyModal, setShowVeHoneyModal] = useState(false);
   const [showHoneyModal, setShowHoneyModal] = useState(false);
-  const [vehoneySupply, setVehoneySupply] = useState("");
+  const [vehoneySupply, setVehoneySupply] = useState('');
 
+  const { govToken, lockedSupply } = useGovernor();
 
-  const { govToken, veToken, lockedSupply } = useGovernor();
-  
-  const { veHoneyAmount, lockedAmount, lockedPeriodEnd, pHoneyAmount, honeyAmount, depositedAmount } = useGovernance();
+  const {
+    veHoneyAmount,
+    lockedAmount,
+    lockedPeriodEnd,
+    pHoneyAmount,
+    honeyAmount,
+    depositedAmount
+  } = useGovernance();
 
   const { data: govTokenData } = useTokenMint(govToken?.mintAccount);
+
   const totalSupplyFmt =
     govTokenData && govToken
       ? new TokenAmount(govToken, govTokenData.account.supply).format({
@@ -86,26 +70,21 @@ const Governance: NextPage = () => {
   );
   // ============================================================================
 
-  const { totalVeHoney } = useStake(
-    STAKE_POOL_ADDRESS,
-    LOCKER_ADDRESS
-  );
+  const { totalVeHoney } = useStake(STAKE_POOL_ADDRESS, LOCKER_ADDRESS);
 
   const getVeHoneySupply = useCallback(async () => {
-    const response = await totalVeHoney()
-    
-    setVehoneySupply(response.toFixed(0))
-  }, [totalVeHoney])
- 
+    const response = await totalVeHoney();
 
-  useEffect(()=>{
-    getVeHoneySupply()
-  }, [getVeHoneySupply, totalVeHoney])
+    setVehoneySupply(response.toFixed(0));
+  }, [totalVeHoney]);
 
+  useEffect(() => {
+    getVeHoneySupply();
+  }, []);
 
   return (
     <Layout>
-       <HeadSeo
+      <HeadSeo
         title={`Governance | ${siteMetadata.companyName}`}
         description={`Propose, vote and vest your HONEY for veHONEY to participate in Honey DAO governance.`}
         ogImageUrl={'https://app.honey.finance/honey-og-image.png'}
@@ -229,7 +208,6 @@ const Governance: NextPage = () => {
                   paddingBottom={{ xs: '3', sm: '0' }}
                   borderBottomWidth={{ xs: '0.375', sm: '0' }}
                   borderRightWidth={{ xs: '0', sm: '0.375' }}
-
                 >
                   <Stack flex={1} justify="space-between" space="6">
                     <Stack justify="space-between" direction="horizontal">

From 47c5c9251b5b7cfc5771aebeeac8d2f4839077e7 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Tue, 16 Aug 2022 17:03:24 +0200
Subject: [PATCH 093/101] feat(governance): add config file for enviroment
 variables

---
 components/HoneyModal/HoneyModal.tsx     | 13 +---
 components/PHoneyModal/PHoneyModal.tsx   | 14 +----
 components/VeHoneyModal/VeHoneyModal.tsx | 13 +---
 config.ts                                | 76 ++++++++++++++++++++++++
 contexts/GovernanceProvider.tsx          | 13 +---
 global.d.ts                              | 16 +++++
 helpers/dao/constants.ts                 |  3 +-
 helpers/sdk/constant.ts                  | 21 ++-----
 pages/governance/index.tsx               | 13 ++--
 tsconfig.json                            |  2 +-
 10 files changed, 116 insertions(+), 68 deletions(-)
 create mode 100644 config.ts
 create mode 100644 global.d.ts

diff --git a/components/HoneyModal/HoneyModal.tsx b/components/HoneyModal/HoneyModal.tsx
index e59e8c0e..6c37c8a0 100644
--- a/components/HoneyModal/HoneyModal.tsx
+++ b/components/HoneyModal/HoneyModal.tsx
@@ -7,6 +7,7 @@ import { useStake } from 'hooks/useStake';
 import { HONEY_DECIMALS } from 'helpers/sdk/constant';
 import { convertToBN } from 'helpers/utils';
 import { useGovernance } from 'contexts/GovernanceProvider';
+import config from "../../config"
 
 const HoneyModal = () => {
   const [amount, setAmount] = useState<number>(0);
@@ -36,16 +37,8 @@ const HoneyModal = () => {
     return 0;
   }, [vestingPeriod]);
 
-  // ======================== Should replace with configuration ================
-  const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
-      '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
-  );
-  const LOCKER_ADDRESS = new PublicKey(
-    process.env.NEXT_PUBLIC_LOCKER_ADDR ||
-      '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
-  );
-  // ============================================================================
+  const STAKE_POOL_ADDRESS = new PublicKey(config.NEXT_PUBLIC_STAKE_POOL_ADDRESS);
+  const LOCKER_ADDRESS = new PublicKey(config.NEXT_PUBLIC_LOCKER_ADDR);
 
   const { lock, unlock, escrow } = useStake(STAKE_POOL_ADDRESS, LOCKER_ADDRESS);
 
diff --git a/components/PHoneyModal/PHoneyModal.tsx b/components/PHoneyModal/PHoneyModal.tsx
index c8380c1b..725713df 100644
--- a/components/PHoneyModal/PHoneyModal.tsx
+++ b/components/PHoneyModal/PHoneyModal.tsx
@@ -5,8 +5,8 @@ import { useStake } from 'hooks/useStake';
 import { PHONEY_DECIMALS } from 'helpers/sdk/constant';
 import { convertToBN } from 'helpers/utils';
 import { useGovernance } from 'contexts/GovernanceProvider';
+import config from '../../config'
 
-// console.log("The stake pool address is : ", process.env.PUBLIC_NEXT_PUBLIC_STAKE_POOL_ADDRESS)
 const PHoneyModal = () => {
   const [amount, setAmount] = useState<number>(0);
   const [isClaimable, setIsClaimable] = useState<boolean>(false);
@@ -19,16 +19,8 @@ const PHoneyModal = () => {
 
   const { depositedAmount, pHoneyAmount } = useGovernance();
 
-  // ======================== Should replace with configuration ================
-  const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
-      '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
-  );
-  const LOCKER_ADDRESS = new PublicKey(
-    process.env.NEXT_PUBLIC_LOCKER_ADDR ||
-      '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
-  );
-  // ============================================================================
+  const STAKE_POOL_ADDRESS = new PublicKey(config.NEXT_PUBLIC_STAKE_POOL_ADDRESS);
+  const LOCKER_ADDRESS = new PublicKey(config.NEXT_PUBLIC_LOCKER_ADDR);
 
   const { user, deposit, claim, claimableAmount } = useStake(
     STAKE_POOL_ADDRESS,
diff --git a/components/VeHoneyModal/VeHoneyModal.tsx b/components/VeHoneyModal/VeHoneyModal.tsx
index 6ebbec6d..b34d0730 100644
--- a/components/VeHoneyModal/VeHoneyModal.tsx
+++ b/components/VeHoneyModal/VeHoneyModal.tsx
@@ -7,6 +7,7 @@ import { useStake } from 'hooks/useStake';
 import { PHONEY_DECIMALS } from 'helpers/sdk/constant';
 import { convertToBN } from 'helpers/utils';
 import { useGovernance } from 'contexts/GovernanceProvider';
+import config from '../../config'
 
 const VeHoneyModal = () => {
   const [amount, setAmount] = useState<number>(0);
@@ -48,16 +49,8 @@ const VeHoneyModal = () => {
     return 0;
   }, [vestingPeriod]);
 
-  // ======================== Should replace with configuration ================
-  const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
-      '4v62DWSwrUVEHe2g88MeyJ7g32vVzQsCnADZF8yUy8iU'
-  );
-  const LOCKER_ADDRESS = new PublicKey(
-    process.env.NEXT_PUBLIC_LOCKER_ADDR ||
-      '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
-  );
-  // ============================================================================
+  const STAKE_POOL_ADDRESS = new PublicKey(config.NEXT_PUBLIC_STAKE_POOL_ADDRESS);
+  const LOCKER_ADDRESS = new PublicKey(config.NEXT_PUBLIC_LOCKER_ADDR);
 
   const { stake, unlock, escrow } = useStake(
     STAKE_POOL_ADDRESS,
diff --git a/config.ts b/config.ts
new file mode 100644
index 00000000..67b9cea0
--- /dev/null
+++ b/config.ts
@@ -0,0 +1,76 @@
+import path from 'path';
+import dotenv from 'dotenv';
+
+// Parsing the env file.
+dotenv.config({ path: path.resolve(__dirname, './.env') });
+
+// Interface to load env variables
+// Note these variables can possibly be undefined
+// as someone could skip these varibales or not setup a .env file at all
+
+interface ENV {
+  NEXT_PUBLIC_LOCKER_ADDR: string | undefined;
+  NEXT_PUBLIC_VOTER_PROGRAM_ID: string | undefined;
+  NEXT_PUBLIC_STAKE_PROGRAM_ID: string | undefined;
+  NEXT_PUBLIC_GOVERNOR_ADDRESS: string | undefined;
+  NEXT_PUBLIC_SMART_WALLET_ADDRESS: string | undefined;
+  NEXT_PUBLIC_RPC_NODE: string | undefined;
+  NEXT_PUBLIC_GA: string | undefined;
+  NEXT_PUBLIC_WHITELIST_ENTRY: string | undefined;
+  NEXT_PUBLIC_PHONEY_MINT: string | undefined;
+  NEXT_PUBLIC_HONEY_MINT: string | undefined;
+  NEXT_PUBLIC_STAKE_POOL_ADDRESS: string | undefined;
+  NEXT_PUBLIC_HONEY_MINT_WRAPPER: string | undefined;
+}
+
+interface Config {
+  NEXT_PUBLIC_LOCKER_ADDR: string;
+  NEXT_PUBLIC_VOTER_PROGRAM_ID: string;
+  NEXT_PUBLIC_STAKE_PROGRAM_ID: string;
+  NEXT_PUBLIC_GOVERNOR_ADDRESS: string;
+  NEXT_PUBLIC_SMART_WALLET_ADDRESS: string;
+  NEXT_PUBLIC_RPC_NODE: string;
+  NEXT_PUBLIC_GA: string;
+  NEXT_PUBLIC_WHITELIST_ENTRY: string;
+  NEXT_PUBLIC_PHONEY_MINT: string;
+  NEXT_PUBLIC_HONEY_MINT: string;
+  NEXT_PUBLIC_STAKE_POOL_ADDRESS: string;
+  NEXT_PUBLIC_HONEY_MINT_WRAPPER: string;
+}
+
+// Loading process.env as ENV interface
+
+const getConfig = (): ENV => {
+  return {
+    NEXT_PUBLIC_LOCKER_ADDR: process.env.NEXT_PUBLIC_LOCKER_ADDR,
+    NEXT_PUBLIC_VOTER_PROGRAM_ID: process.env.NEXT_PUBLIC_VOTER_PROGRAM_ID,
+    NEXT_PUBLIC_STAKE_PROGRAM_ID: process.env.NEXT_PUBLIC_STAKE_PROGRAM_ID,
+    NEXT_PUBLIC_GOVERNOR_ADDRESS: process.env.NEXT_PUBLIC_GOVERNOR_ADDRESS,
+    NEXT_PUBLIC_SMART_WALLET_ADDRESS:
+      process.env.NEXT_PUBLIC_SMART_WALLET_ADDRESS,
+    NEXT_PUBLIC_RPC_NODE: process.env.NEXT_PUBLIC_RPC_NODE,
+    NEXT_PUBLIC_GA: process.env.NEXT_PUBLIC_GA,
+    NEXT_PUBLIC_WHITELIST_ENTRY: process.env.NEXT_PUBLIC_WHITELIST_ENTRY,
+    NEXT_PUBLIC_PHONEY_MINT: process.env.NEXT_PUBLIC_PHONEY_MINT,
+    NEXT_PUBLIC_HONEY_MINT: process.env.NEXT_PUBLIC_HONEY_MINT,
+    NEXT_PUBLIC_STAKE_POOL_ADDRESS: process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS,
+    NEXT_PUBLIC_HONEY_MINT_WRAPPER: process.env.NEXT_PUBLIC_HONEY_MINT_WRAPPER
+  };
+};
+
+// Throwing an Error if any field was undefined
+
+const getSanitzedConfig = (config: ENV): Config => {
+  for (const [key, value] of Object.entries(config)) {
+    if (value === undefined) {
+      throw new Error(`Missing key ${key} in config.env`);
+    }
+  }
+  return config as Config;
+};
+
+const config = getConfig();
+
+const sanitizedConfig = getSanitzedConfig(config);
+
+export default sanitizedConfig;
diff --git a/contexts/GovernanceProvider.tsx b/contexts/GovernanceProvider.tsx
index 613b3364..bf22f373 100644
--- a/contexts/GovernanceProvider.tsx
+++ b/contexts/GovernanceProvider.tsx
@@ -4,6 +4,7 @@ import { PublicKey } from '@solana/web3.js';
 import { useStake } from 'hooks/useStake';
 import { HONEY_DECIMALS, HONEY_MINT, PHONEY_DECIMALS, PHONEY_MINT } from "helpers/sdk";
 import { useAccounts } from "hooks/useAccounts";
+import config from "../config"
 
 type govContextType = {
 
@@ -38,15 +39,8 @@ type Props = {
 };
 
 export function GovernanceProvider({ children }: Props) {
-    const STAKE_POOL_ADDRESS = new PublicKey(
-        process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
-          'Cv9Hx3VRvqkz5JRPiZM8A2BH31yvpcT4qiUJLdtgu7TE'
-      );
-      const LOCKER_ADDRESS = new PublicKey(
-        process.env.NEXT_PUBLIC_LOCKER_ADDR ||
-          '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
-      );
-      // ============================================================================
+  const STAKE_POOL_ADDRESS = new PublicKey(config.NEXT_PUBLIC_STAKE_POOL_ADDRESS);
+  const LOCKER_ADDRESS = new PublicKey(config.NEXT_PUBLIC_LOCKER_ADDR);
     
       const { user, escrow, totalVeHoney } = useStake(
         STAKE_POOL_ADDRESS,
@@ -55,7 +49,6 @@ export function GovernanceProvider({ children }: Props) {
     
     // use token accounts for honey and phoney
     const { tokenAccounts } = useAccounts();
-    // ======================== Should replace with configuration ================
     const pHoneyToken = tokenAccounts.find(t => t.info.mint.equals(PHONEY_MINT));
     const honeyToken = tokenAccounts.find(t => t.info.mint.equals(HONEY_MINT));
   
diff --git a/global.d.ts b/global.d.ts
new file mode 100644
index 00000000..c4171d8a
--- /dev/null
+++ b/global.d.ts
@@ -0,0 +1,16 @@
+declare namespace NodeJS {
+  interface ProcessEnv {
+    NEXT_PUBLIC_LOCKER_ADDR: string;
+    NEXT_PUBLIC_VOTER_PROGRAM_ID: string;
+    NEXT_PUBLIC_STAKE_PROGRAM_ID: string;
+    NEXT_PUBLIC_GOVERNOR_ADDRESS: string;
+    NEXT_PUBLIC_SMART_WALLET_ADDRESS: string;
+    NEXT_PUBLIC_RPC_NODE: string;
+    NEXT_PUBLIC_GA: string;
+    NEXT_PUBLIC_WHITELIST_ENTRY: string;
+    NEXT_PUBLIC_PHONEY_MINT: string;
+    NEXT_PUBLIC_HONEY_MINT: string;
+    NEXT_PUBLIC_STAKE_POOL_ADDRESS: string;
+    NEXT_PUBLIC_HONEY_MINT_WRAPPER: string;
+  }
+}
diff --git a/helpers/dao/constants.ts b/helpers/dao/constants.ts
index fe050b3d..1de81239 100644
--- a/helpers/dao/constants.ts
+++ b/helpers/dao/constants.ts
@@ -3,6 +3,7 @@ import { PublicKey } from '@solana/web3.js';
 import BN from 'bn.js';
 import { GovernJSON } from 'helpers/types/govern';
 import { IDL as LockedVoterJSON } from 'helpers/types/ve_honey';
+import config from '../../config'
 
 import type {
   GovernanceParameters,
@@ -24,7 +25,7 @@ export interface TribecaPrograms {
 // See `Anchor.toml` for all addresses.
 export const HONEY_DAO_ADDRESSES = {
   Govern: new PublicKey('Govz1VyoyLD5BL6CSCxUJLVLsQHRwjfFj1prNsdNg5Jw'),
-  LockedVoter: new PublicKey(process.env.NEXT_PUBLIC_VOTER_PROGRAM_ID!)
+  LockedVoter: new PublicKey(config.NEXT_PUBLIC_VOTER_PROGRAM_ID!)
 };
 
 /**
diff --git a/helpers/sdk/constant.ts b/helpers/sdk/constant.ts
index 0f9163ac..c47c8726 100644
--- a/helpers/sdk/constant.ts
+++ b/helpers/sdk/constant.ts
@@ -1,18 +1,13 @@
 import { PublicKey } from '@solana/web3.js';
+import config from '../../config';
 
 export const HONEY_WADS = 1000000;
 
-export const HONEY_MINT = new PublicKey(
-  process.env.NEXT_PUBLIC_HONEY_MINT ||
-    'Bh7vMfPZkGsQJqUjBBGGfcAj6yQdkL8SoLtK5TCYeJtY'
-);
+export const HONEY_MINT = new PublicKey(config.NEXT_PUBLIC_HONEY_MINT);
 
 export const HONEY_DECIMALS = 6;
 
-export const PHONEY_MINT = new PublicKey(
-  process.env.NEXT_PUBLIC_PHONEY_MINT ||
-    '7unYPivFG6cuDGeDVjhbutcjYDcMKPu2mBCnRyJ5Qki2'
-);
+export const PHONEY_MINT = new PublicKey(config.NEXT_PUBLIC_PHONEY_MINT);
 
 export const WHITELIST_ENTRY = new PublicKey(
   'G62oYbYUbchjHMRddcFaDqRQ5CuNV9KE36kfzyYvFuDy'
@@ -22,12 +17,6 @@ export const PHONEY_DECIMALS = 6;
 
 export const PROPOSAL_TITLE_MAX_LEN = 140;
 
-export const GOVERNOR_ADDRESS = new PublicKey(
-  process.env.NEXT_PUBLIC_GOVERNOR_ADDRESS ||
-    'CSFk5VQwpQVs5tVXRLi5jtqJVkySAPxBxAQPD4W2mePa'
-);
+export const GOVERNOR_ADDRESS = new PublicKey(config.NEXT_PUBLIC_GOVERNOR_ADDRESS);
 
-export const HONEY_MINT_WRAPPER = new PublicKey(
-  process.env.NEXT_PUBLIC_HONEY_MINT_WRAPPER ||
-    '9vMQwBT67tMN21BRkRoJQqJ7EaZjK3afkHFjZxTzARE7'
-);
+export const HONEY_MINT_WRAPPER = new PublicKey(config.NEXT_PUBLIC_HONEY_MINT_WRAPPER);
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 146e1775..5ea69649 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -21,6 +21,7 @@ import { useGovernor } from 'hooks/tribeca/useGovernor';
 import { TokenAmount } from '@saberhq/token-utils';
 import ToolTip from 'components/ToolTip/ToolTip';
 import { useGovernance } from 'contexts/GovernanceProvider';
+import config from '../../config';
 
 const Governance: NextPage = () => {
   const wallet = useConnectedWallet();
@@ -60,15 +61,9 @@ const Governance: NextPage = () => {
       })
     : lockedSupply;
 
-  const STAKE_POOL_ADDRESS = new PublicKey(
-    process.env.NEXT_PUBLIC_STAKE_POOL_ADDRESS ||
-      'Cv9Hx3VRvqkz5JRPiZM8A2BH31yvpcT4qiUJLdtgu7TE'
-  );
-  const LOCKER_ADDRESS = new PublicKey(
-    process.env.NEXT_PUBLIC_LOCKER_ADDR ||
-      '5FnK8H9kDbmPNpBYMuvSkDevkMfnVPRrPNNqmTQyBBae'
-  );
-  // ============================================================================
+    const STAKE_POOL_ADDRESS = new PublicKey(config.NEXT_PUBLIC_STAKE_POOL_ADDRESS);
+    const LOCKER_ADDRESS = new PublicKey(config.NEXT_PUBLIC_LOCKER_ADDR);
+  
 
   const { totalVeHoney } = useStake(STAKE_POOL_ADDRESS, LOCKER_ADDRESS);
 
diff --git a/tsconfig.json b/tsconfig.json
index 2518db19..82ab7738 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,6 +16,6 @@
     "baseUrl": ".",
     "incremental": true
   },
-  "include": ["next-env.d.ts", "index.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": ["next-env.d.ts","./global.d.ts", "index.d.ts", "**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"]
 }

From 571cc43626dd5b6b308cd059decf3e68dac4fe40 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Wed, 17 Aug 2022 23:31:37 +0200
Subject: [PATCH 094/101] feat(governance): add config file for enviroment
 variables

---
 config.ts | 12 ------------
 yarn.lock |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/config.ts b/config.ts
index 67b9cea0..efd825ee 100644
--- a/config.ts
+++ b/config.ts
@@ -1,13 +1,3 @@
-import path from 'path';
-import dotenv from 'dotenv';
-
-// Parsing the env file.
-dotenv.config({ path: path.resolve(__dirname, './.env') });
-
-// Interface to load env variables
-// Note these variables can possibly be undefined
-// as someone could skip these varibales or not setup a .env file at all
-
 interface ENV {
   NEXT_PUBLIC_LOCKER_ADDR: string | undefined;
   NEXT_PUBLIC_VOTER_PROGRAM_ID: string | undefined;
@@ -39,7 +29,6 @@ interface Config {
 }
 
 // Loading process.env as ENV interface
-
 const getConfig = (): ENV => {
   return {
     NEXT_PUBLIC_LOCKER_ADDR: process.env.NEXT_PUBLIC_LOCKER_ADDR,
@@ -59,7 +48,6 @@ const getConfig = (): ENV => {
 };
 
 // Throwing an Error if any field was undefined
-
 const getSanitzedConfig = (config: ENV): Config => {
   for (const [key, value] of Object.entries(config)) {
     if (value === undefined) {
diff --git a/yarn.lock b/yarn.lock
index 5cdfd1cf..79e5a631 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3580,7 +3580,7 @@ fs.realpath@^1.0.0:
 fs@^0.0.1-security:
   version "0.0.1-security"
   resolved "https://registry.yarnpkg.com/fs/-/fs-0.0.1-security.tgz#8a7bd37186b6dddf3813f23858b57ecaaf5e41d4"
-  integrity sha1-invTcYa23d84E/I4WLV+yq9eQdQ=
+  integrity sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==
 
 fsevents@^1.2.7:
   version "1.2.13"

From 8c584efecf74dd198571afdb9927f2ab201a181c Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Fri, 19 Aug 2022 17:04:17 +0200
Subject: [PATCH 095/101] fix(governance): add correct connect button

---
 .../locked-voter/actions/ProposalVote.tsx                  | 7 ++++++-
 components/common/AsyncButton.tsx                          | 2 +-
 hooks/useStake.tsx                                         | 2 +-
 pages/governance/index.tsx                                 | 2 +-
 pages/governance/proposals/[proposalIndex]/index.tsx       | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
index 635393e9..dfe793f6 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/actions/ProposalVote.tsx
@@ -14,6 +14,8 @@ import { Card } from 'components/common/governance/Card';
 import { CastVoteButton } from '../CastVoteButton';
 import { Box, Button, Text } from 'degen';
 import Link from 'next/link';
+import { useWalletKit } from '@gokiprotocol/walletkit';
+
 
 interface Props {
   proposalInfo: ProposalInfo;
@@ -21,6 +23,7 @@ interface Props {
 }
 
 export const ProposalVote: React.FC<Props> = ({ proposalInfo }: Props) => {
+  const { connect } = useWalletKit();
   const { veToken } = useGovernor();
   const { sdkMut } = useSDK();
   const { data: escrow, veBalance } = useUserEscrow();
@@ -68,7 +71,9 @@ export const ProposalVote: React.FC<Props> = ({ proposalInfo }: Props) => {
       <Box paddingY="8">
         <Box display="flex" flexDirection="column" alignItems="center" gap="4">
           {!sdkMut ? (
-            <ConnectWalletButton />
+            <Button variant="primary" size="small" width="48" onClick={connect}>
+            Connect Wallet
+          </Button>
           ) : !veBalance ? (
             <Box paddingX="8" fontSize="small" textAlign="center">
               <Text as="p">
diff --git a/components/common/AsyncButton.tsx b/components/common/AsyncButton.tsx
index c724f0e6..c89cb6ad 100644
--- a/components/common/AsyncButton.tsx
+++ b/components/common/AsyncButton.tsx
@@ -44,7 +44,7 @@ export const AsyncButton: React.FC<Props> = ({
       disabled={false}
       onClick={() => connect()}
     >
-      {connectWalletOverride ?? 'Connect Wallet'}
+      {connectWalletOverride ?? 'Connect TEST'}
     </Button>
   );
 };
diff --git a/hooks/useStake.tsx b/hooks/useStake.tsx
index 281d6af4..f71a6dad 100644
--- a/hooks/useStake.tsx
+++ b/hooks/useStake.tsx
@@ -33,7 +33,7 @@ const checkErrorAndShowToast = (error: any, defaultToastMsg: string) => {
   return toast.error(toastMsg);
 };
 
-export const useStake = (stakePool: PublicKey, locker: PublicKey) => {
+export const useStake = (stakePool: PublicKey, locker: PublicKey) => {  
   const wallet = useConnectedWallet();
   const connection = useConnection();
   const [sc, setSC] = useState<StakeClient | undefined>(undefined);
diff --git a/pages/governance/index.tsx b/pages/governance/index.tsx
index 5ea69649..01ecbc50 100644
--- a/pages/governance/index.tsx
+++ b/pages/governance/index.tsx
@@ -75,7 +75,7 @@ const Governance: NextPage = () => {
 
   useEffect(() => {
     getVeHoneySupply();
-  }, []);
+  }, [getVeHoneySupply]);
 
   return (
     <Layout>
diff --git a/pages/governance/proposals/[proposalIndex]/index.tsx b/pages/governance/proposals/[proposalIndex]/index.tsx
index a64de448..7a56e13f 100644
--- a/pages/governance/proposals/[proposalIndex]/index.tsx
+++ b/pages/governance/proposals/[proposalIndex]/index.tsx
@@ -1,4 +1,4 @@
-import { NextPage } from 'next';
+  import { NextPage } from 'next';
 import Layout from 'components/Layout/Layout';
 import { ProposalIndexView } from 'components/Proposals/ProposalIndexView';
 import { Button, IconChevronLeft, Stack } from 'degen';

From 4cce6d443db2c6bf3f2f83691ba9d4c101c7cfec Mon Sep 17 00:00:00 2001
From: BowTiedHeron <93859808+BowTiedHeron@users.noreply.github.com>
Date: Wed, 31 Aug 2022 09:25:08 +0200
Subject: [PATCH 096/101] Styling fixes on the gov branch (#179)

fix: removed execute card for executed proposals

Co-authored-by: daan <danieloshos3@gmail.com>
---
 .../Proposals/ProposalIndexView/locked-voter/index.tsx   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/Proposals/ProposalIndexView/locked-voter/index.tsx b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
index 2cae8ee9..ebd19c3d 100644
--- a/components/Proposals/ProposalIndexView/locked-voter/index.tsx
+++ b/components/Proposals/ProposalIndexView/locked-voter/index.tsx
@@ -2,7 +2,7 @@ import { ProposalState, VoteSide } from 'helpers/dao';
 import { noop } from 'lodash';
 import { useRouter } from 'next/router';
 
-import { useProposal } from 'hooks/tribeca/useProposals';
+import { useProposal, ZERO } from 'hooks/tribeca/useProposals';
 // import { ContentLoader } from '../../../../../common/ContentLoader';
 import { GovernancePage } from 'components/common/governance/GovernancePage';
 // import { Profile } from 'components/common/governance/Profile';
@@ -87,9 +87,10 @@ export const ProposalIndexView: React.FC = () => {
         {proposalInfo?.status.state === ProposalState.Succeeded && (
           <ProposalQueue proposal={proposalInfo} onActivate={noop} />
         )}
-        {proposalInfo?.status.state === ProposalState.Queued && (
-          <ProposalExecute proposal={proposalInfo} onActivate={noop} />
-        )}
+        {proposalInfo?.status.state === ProposalState.Queued &&
+          !proposalInfo.status.executed && (
+            <ProposalExecute proposal={proposalInfo} onActivate={noop} />
+          )}
         <ProposalHistory proposalInfo={proposalInfo} />
       </Box>
     </GovernancePage>

From 3dfb10c2a4c807057de80619c1ad62fb43688bd2 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Wed, 31 Aug 2022 16:52:13 +0200
Subject: [PATCH 097/101] fix(governance): disable unlock locker button

---
 components/HoneyModal/HoneyModal.tsx     | 2 +-
 components/VeHoneyModal/VeHoneyModal.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/HoneyModal/HoneyModal.tsx b/components/HoneyModal/HoneyModal.tsx
index 6c37c8a0..dd27a267 100644
--- a/components/HoneyModal/HoneyModal.tsx
+++ b/components/HoneyModal/HoneyModal.tsx
@@ -126,7 +126,7 @@ const HoneyModal = () => {
           >
             {amount ? 'Deposit' : 'Enter amount'}
           </Button>
-          <Button onClick={unlock} disabled={lockPeriodHasEnded} width="full">
+          <Button onClick={unlock} disabled={true} width="full">
             Unlock
           </Button>
         </Stack>
diff --git a/components/VeHoneyModal/VeHoneyModal.tsx b/components/VeHoneyModal/VeHoneyModal.tsx
index b34d0730..409f1a34 100644
--- a/components/VeHoneyModal/VeHoneyModal.tsx
+++ b/components/VeHoneyModal/VeHoneyModal.tsx
@@ -159,7 +159,7 @@ const VeHoneyModal = () => {
           >
             {amount ? 'Deposit' : 'Enter amount'}
           </Button>
-          <Button onClick={unlock} disabled={lockPeriodHasEnded} width="full">
+          <Button onClick={unlock} disabled={true} width="full">
             Unlock
           </Button>
         </Stack>

From d98b8a6da1a0647e65c7eb4fc039d76905046b15 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Sun, 11 Sep 2022 16:22:54 +0200
Subject: [PATCH 098/101] feat(governance): add formatted lock period end date

---
 helpers/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/utils.ts b/helpers/utils.ts
index 2b3b3b6f..f3b3b4d0 100644
--- a/helpers/utils.ts
+++ b/helpers/utils.ts
@@ -74,7 +74,7 @@ export const convertBnTimestampToDate = (amount: anchor.BN): string => {
   const timestamp = new anchor.BN(amount).toNumber();
 
   const date = new Date(timestamp * 1000);
-  const formattedTime = date.toLocaleDateString('en-US');
+  const formattedTime = date.toDateString();
 
   return formattedTime;
 };

From 14e59278308c9714a3d3db5d515a73ca0f11b48e Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Sun, 11 Sep 2022 16:38:31 +0200
Subject: [PATCH 099/101] fix(governance): improve date formatting

---
 helpers/utils.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/helpers/utils.ts b/helpers/utils.ts
index f3b3b4d0..7f6adc20 100644
--- a/helpers/utils.ts
+++ b/helpers/utils.ts
@@ -74,7 +74,9 @@ export const convertBnTimestampToDate = (amount: anchor.BN): string => {
   const timestamp = new anchor.BN(amount).toNumber();
 
   const date = new Date(timestamp * 1000);
-  const formattedTime = date.toDateString();
+
+  const formattedTime = date.toLocaleDateString('en-us', {  year:"numeric", month:"short", day:"numeric"}) 
+;
 
   return formattedTime;
 };

From 1bdb3b5861033a7712b977e40915ee4ad470c88b Mon Sep 17 00:00:00 2001
From: BowTiedHeron <bowtiedheron@protonmail.com>
Date: Sat, 24 Sep 2022 18:37:52 +0200
Subject: [PATCH 100/101] preparing for HIP#4

---
 pages/_middleware.ts                 | 2 +-
 pages/governance/proposals/index.tsx | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/_middleware.ts b/pages/_middleware.ts
index 45110598..3b6e8929 100644
--- a/pages/_middleware.ts
+++ b/pages/_middleware.ts
@@ -3,7 +3,7 @@ export async function middleware(req: any, ev: any) {
   const { pathname } = req.nextUrl;
   if (pathname == '/') {
     const url = req.nextUrl.clone();
-    url.pathname = '/farm';
+    url.pathname = '/governance';
     return NextResponse.redirect(url);
   }
   return NextResponse.next();
diff --git a/pages/governance/proposals/index.tsx b/pages/governance/proposals/index.tsx
index bf4edec5..3a090478 100644
--- a/pages/governance/proposals/index.tsx
+++ b/pages/governance/proposals/index.tsx
@@ -41,7 +41,8 @@ const Proposals: NextPage = () => {
                 setIsActive={setShowDrafts}
               />
             </Stack>
-            {wallet?.connected ? (
+            {/* commented out the new proposal button
+                  {wallet?.connected ? (
               <Link href="/governance/proposals/create" passHref>
                 <Button variant="secondary" prefix={<IconPlus />} size="small">
                   New proposal
@@ -56,7 +57,7 @@ const Proposals: NextPage = () => {
               >
                 New proposal
               </Button>
-            )}
+            )} */}
           </Stack>
           <Box backgroundColor="background" borderRadius="2xLarge" padding="6">
             <ProposalsList showDrafts={showDrafts} />

From 8885218eb81bf7823c35e5ef54757649346e07d9 Mon Sep 17 00:00:00 2001
From: gonwi <gonzalo.astorgaie@gmail.com>
Date: Mon, 26 Sep 2022 23:34:47 +0200
Subject: [PATCH 101/101] fix(governance): fix lockPeriodHasEnded conditional
 and enable unlock button

---
 components/HoneyModal/HoneyModal.tsx     | 2 +-
 components/VeHoneyModal/VeHoneyModal.tsx | 2 +-
 contexts/GovernanceProvider.tsx          | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/HoneyModal/HoneyModal.tsx b/components/HoneyModal/HoneyModal.tsx
index dd27a267..6c37c8a0 100644
--- a/components/HoneyModal/HoneyModal.tsx
+++ b/components/HoneyModal/HoneyModal.tsx
@@ -126,7 +126,7 @@ const HoneyModal = () => {
           >
             {amount ? 'Deposit' : 'Enter amount'}
           </Button>
-          <Button onClick={unlock} disabled={true} width="full">
+          <Button onClick={unlock} disabled={lockPeriodHasEnded} width="full">
             Unlock
           </Button>
         </Stack>
diff --git a/components/VeHoneyModal/VeHoneyModal.tsx b/components/VeHoneyModal/VeHoneyModal.tsx
index 409f1a34..b34d0730 100644
--- a/components/VeHoneyModal/VeHoneyModal.tsx
+++ b/components/VeHoneyModal/VeHoneyModal.tsx
@@ -159,7 +159,7 @@ const VeHoneyModal = () => {
           >
             {amount ? 'Deposit' : 'Enter amount'}
           </Button>
-          <Button onClick={unlock} disabled={true} width="full">
+          <Button onClick={unlock} disabled={lockPeriodHasEnded} width="full">
             Unlock
           </Button>
         </Stack>
diff --git a/contexts/GovernanceProvider.tsx b/contexts/GovernanceProvider.tsx
index bf22f373..83810ab5 100644
--- a/contexts/GovernanceProvider.tsx
+++ b/contexts/GovernanceProvider.tsx
@@ -114,9 +114,12 @@ export function GovernanceProvider({ children }: Props) {
       if (!escrow) {
         return true;
       }
-      const lockEndsTimestamp = convert(escrow.escrowEndsAt, 0);
+      const lockEndsTimestamp = convert(escrow.escrowEndsAt, 0) * 1000;
+      console.log("Lock Ends" + lockEndsTimestamp)
       const currentTimestamp = new Date().getTime();
-  
+      console.log("Current Time" + currentTimestamp)
+      // console.log("comparation" + if )
+
       if (lockEndsTimestamp >= currentTimestamp) {
         return true;
       }