Moved proposal and voting module adapters into common package.

DA0-DA0 · Oct 22, 2022 · 5ca82d4 · 5ca82d4
1 parent e0473d1
commit 5ca82d4
Show file tree

Hide file tree

Showing 198 changed files with 256 additions and 417 deletions.
diff --git a/apps/dapp/components/TokenCard.tsx b/apps/dapp/components/TokenCard.tsx
@@ -5,8 +5,8 @@ import { useRouter } from 'next/router'
 import { useCallback, useEffect } from 'react'
 import { useSetRecoilState } from 'recoil'
 
-import { useActionForKey } from '@dao-dao/common/actions'
 import { useEncodedCwdProposalSinglePrefill } from '@dao-dao/common'
+import { useActionForKey } from '@dao-dao/common/actions'
 import {
   refreshNativeTokenStakingInfoAtom,
   tokenCardLazyStakingInfoSelector,

diff --git a/apps/dapp/components/dao/tabs/TreasuryAndNftsTab.tsx b/apps/dapp/components/dao/tabs/TreasuryAndNftsTab.tsx
@@ -7,6 +7,10 @@ import {
   useEncodedCwdProposalSinglePrefill,
 } from '@dao-dao/common'
 import { useActionForKey } from '@dao-dao/common/actions'
+import {
+  useCw20GovernanceTokenInfoResponseIfExists,
+  useNativeGovernanceTokenInfoResponseIfExists,
+} from '@dao-dao/common/voting-module-adapter'
 import {
   nftCardInfosSelector,
   treasuryTokenCardInfosSelector,
@@ -20,10 +24,6 @@ import {
 } from '@dao-dao/stateless'
 import { ActionKey } from '@dao-dao/types'
 import { loadableToLoadingData } from '@dao-dao/utils'
-import {
-  useCw20GovernanceTokenInfoResponseIfExists,
-  useNativeGovernanceTokenInfoResponseIfExists,
-} from '@dao-dao/voting-module-adapter'
 
 import { TokenCard } from '@/components'
 

diff --git a/apps/dapp/components/profile/ProfileNewProposalCard.tsx b/apps/dapp/components/profile/ProfileNewProposalCard.tsx
@@ -4,14 +4,14 @@
 import { useTranslation } from 'react-i18next'
 
 import { SuspenseLoader } from '@dao-dao/common'
-import { matchAndLoadCommon } from '@dao-dao/proposal-module-adapter'
+import { matchAndLoadCommon } from '@dao-dao/common/proposal-module-adapter'
+import { useVotingModuleAdapter } from '@dao-dao/common/voting-module-adapter'
 import { useWalletProfile } from '@dao-dao/state'
 import {
   ProfileNewProposalCard as StatelessProfileNewProposalCard,
   useAppLayoutContext,
   useDaoInfoContext,
 } from '@dao-dao/stateless'
-import { useVotingModuleAdapter } from '@dao-dao/voting-module-adapter'
 
 export interface ProfileNewProposalCardProps {
   proposalModuleAdapterCommon: ReturnType<typeof matchAndLoadCommon>

diff --git a/apps/dapp/components/profile/ProfileProposalCard.tsx b/apps/dapp/components/profile/ProfileProposalCard.tsx
@@ -8,7 +8,8 @@ import { useRecoilValue, waitForAll } from 'recoil'
 import {
   matchAndLoadCommon,
   useProposalModuleAdapter,
-} from '@dao-dao/proposal-module-adapter'
+} from '@dao-dao/common/proposal-module-adapter'
+import { useVotingModuleAdapter } from '@dao-dao/common/voting-module-adapter'
 import { useVotingModule, useWalletProfile } from '@dao-dao/state'
 import {
   Loader,
@@ -20,7 +21,6 @@ import {
   useDaoInfoContext,
 } from '@dao-dao/stateless'
 import { CheckedDepositInfo } from '@dao-dao/types/contracts/common'
-import { useVotingModuleAdapter } from '@dao-dao/voting-module-adapter'
 
 export interface ProfileProposalCardProps {
   onVoteSuccess: () => void | Promise<void>

diff --git a/apps/dapp/next.config.js b/apps/dapp/next.config.js
@@ -13,8 +13,6 @@ const withTM = require('next-transpile-modules')([
   '@dao-dao/state',
   '@dao-dao/common',
   '@dao-dao/i18n',
-  '@dao-dao/voting-module-adapter',
-  '@dao-dao/proposal-module-adapter',
   '@dao-dao/types',
 ])
 

diff --git a/apps/dapp/package.json b/apps/dapp/package.json
@@ -21,11 +21,9 @@
     "@cosmjs/stargate": "0.28.10",
     "@dao-dao/common": "2.0.1",
     "@dao-dao/i18n": "2.0.1",
-    "@dao-dao/proposal-module-adapter": "2.0.1",
     "@dao-dao/types": "2.0.1",
     "@dao-dao/stateless": "2.0.1",
     "@dao-dao/utils": "2.0.1",
-    "@dao-dao/voting-module-adapter": "2.0.1",
     "@fontsource/inter": "^4.5.7",
     "@fontsource/jetbrains-mono": "^4.5.5",
     "@mui/icons-material": "^5.10.3",

diff --git a/apps/dapp/pages/dao/[address]/index.tsx b/apps/dapp/pages/dao/[address]/index.tsx
@@ -14,15 +14,16 @@ import {
   waitForAll,
 } from 'recoil'
 
-import { useActionForKey } from '@dao-dao/common/actions'
 import {
   DaoInfoBar,
   DaoPageWrapper,
   DaoPageWrapperProps,
   useEncodedCwdProposalSinglePrefill,
 } from '@dao-dao/common'
+import { useActionForKey } from '@dao-dao/common/actions'
+import { matchAndLoadCommon } from '@dao-dao/common/proposal-module-adapter'
 import { makeGetDaoStaticProps } from '@dao-dao/common/server'
-import { matchAndLoadCommon } from '@dao-dao/proposal-module-adapter'
+import { useVotingModuleAdapter } from '@dao-dao/common/voting-module-adapter'
 import {
   CwdCoreV2Selectors,
   usePinnedDaos,
@@ -42,7 +43,6 @@ import {
 import { ActionKey } from '@dao-dao/types'
 import { CheckedDepositInfo } from '@dao-dao/types/contracts/common'
 import { SITE_URL } from '@dao-dao/utils'
-import { useVotingModuleAdapter } from '@dao-dao/voting-module-adapter'
 
 import { ProposalsTab, SubDaosTab, TreasuryAndNftsTab } from '@/components'
 

diff --git a/apps/dapp/pages/dao/[address]/proposals/[proposalId].tsx b/apps/dapp/pages/dao/[address]/proposals/[proposalId].tsx
@@ -8,18 +8,19 @@ import { useCallback, useMemo } from 'react'
 import toast from 'react-hot-toast'
 import { useTranslation } from 'react-i18next'
 
-import { useActions } from '@dao-dao/common/actions'
 import {
   DaoPageWrapper,
   DaoProposalPageWrapperProps,
   Trans,
 } from '@dao-dao/common'
-import { makeGetDaoProposalStaticProps } from '@dao-dao/common/server'
+import { useActions } from '@dao-dao/common/actions'
 import {
   CommonProposalInfo,
   ProposalModuleAdapterProvider,
   useProposalModuleAdapterContext,
-} from '@dao-dao/proposal-module-adapter'
+} from '@dao-dao/common/proposal-module-adapter'
+import { makeGetDaoProposalStaticProps } from '@dao-dao/common/server'
+import { useVotingModuleAdapter } from '@dao-dao/common/voting-module-adapter'
 import { useProfile } from '@dao-dao/state'
 import {
   Loader,
@@ -31,7 +32,6 @@ import {
 } from '@dao-dao/stateless'
 import { ActionKey } from '@dao-dao/types'
 import { SITE_URL } from '@dao-dao/utils'
-import { useVotingModuleAdapter } from '@dao-dao/voting-module-adapter'
 
 import { ProfileProposalCard } from '@/components'
 

diff --git a/apps/dapp/pages/dao/[address]/proposals/create.tsx b/apps/dapp/pages/dao/[address]/proposals/create.tsx
@@ -16,13 +16,13 @@ import {
   DaoPageWrapperProps,
   SuspenseLoader,
 } from '@dao-dao/common'
-import { makeGetDaoStaticProps } from '@dao-dao/common/server'
 import {
   BaseNewProposalProps,
   CwdProposalSingleAdapter,
   matchAndLoadCommon,
   matchAdapter as matchProposalModuleAdapter,
-} from '@dao-dao/proposal-module-adapter'
+} from '@dao-dao/common/proposal-module-adapter'
+import { makeGetDaoStaticProps } from '@dao-dao/common/server'
 import {
   proposalCreatedCardPropsAtom,
   proposalDraftsAtom,

diff --git a/apps/dapp/pages/wallet.tsx b/apps/dapp/pages/wallet.tsx
@@ -9,8 +9,8 @@ import { useForm } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 import { useRecoilState } from 'recoil'
 
-import { ActionsProvider, useActions } from '@dao-dao/common/actions'
 import { SuspenseLoader } from '@dao-dao/common'
+import { ActionsProvider, useActions } from '@dao-dao/common/actions'
 import { serverSideTranslations } from '@dao-dao/i18n/serverSideTranslations'
 import { walletTransactionAtom } from '@dao-dao/state'
 import {

diff --git a/package.json b/package.json
@@ -18,8 +18,6 @@
     "common": "yarn workspace @dao-dao/common",
     "i18n": "yarn workspace @dao-dao/i18n",
     "storybook": "yarn workspace @dao-dao/storybook",
-    "proposal-module-adapter": "yarn workspace @dao-dao/proposal-module-adapter",
-    "voting-module-adapter": "yarn workspace @dao-dao/voting-module-adapter",
     "types": "yarn workspace @dao-dao/types"
   },
   "devDependencies": {

diff --git a/packages/common/actions/actions/Instantiate.tsx b/packages/common/actions/actions/Instantiate.tsx
@@ -4,7 +4,6 @@ import { useCallback, useMemo } from 'react'
 import { useFormContext } from 'react-hook-form'
 import { constSelector, useRecoilValue } from 'recoil'
 
-import { useProposalModuleAdapterIfAvailable } from '@dao-dao/proposal-module-adapter/react/context'
 import {
   nativeBalancesSelector,
   transactionEventsSelector,
@@ -25,6 +24,7 @@ import {
   makeWasmMessage,
 } from '@dao-dao/utils'
 
+import { useProposalModuleAdapterIfAvailable } from '../../proposal-module-adapter/react/context'
 import { InstantiateComponent as StatelessInstantiateComponent } from '../components/Instantiate'
 
 interface InstantiateData {

diff --git a/packages/common/actions/actions/Spend.tsx b/packages/common/actions/actions/Spend.tsx
@@ -24,8 +24,8 @@ import {
   makeWasmMessage,
   nativeTokenDecimals,
 } from '@dao-dao/utils'
-import { useCw20GovernanceTokenInfoResponseIfExists } from '@dao-dao/voting-module-adapter'
 
+import { useCw20GovernanceTokenInfoResponseIfExists } from '../../voting-module-adapter'
 import { SpendComponent as StatelessSpendComponent } from '../components/Spend'
 
 interface SpendData {

diff --git a/packages/common/atoms/newDao.ts b/packages/common/atoms/newDao.ts
@@ -1,9 +1,10 @@
 import { atom, atomFamily } from 'recoil'
 
-import { CwdProposalSingleAdapter } from '@dao-dao/proposal-module-adapter/adapters/CwdProposalSingle'
 import { localStorageEffectJSON } from '@dao-dao/state/recoil/effects'
 import { DaoCreatedCardProps, NewDao } from '@dao-dao/types'
-import { CwdVotingCw4Adapter } from '@dao-dao/voting-module-adapter'
+
+import { CwdProposalSingleAdapter } from '../proposal-module-adapter/adapters/CwdProposalSingle'
+import { CwdVotingCw4Adapter } from '../voting-module-adapter'
 
 export const DefaultNewDao: NewDao = {
   name: '',

diff --git a/packages/common/components/CreateDaoForm.tsx b/packages/common/components/CreateDaoForm.tsx
@@ -9,10 +9,6 @@ import toast from 'react-hot-toast'
 import { useTranslation } from 'react-i18next'
 import { useRecoilState } from 'recoil'
 
-import {
-  ProposalModuleAdapter,
-  getAdapterById as getProposalModuleAdapterById,
-} from '@dao-dao/proposal-module-adapter'
 import {
   CwAdminFactoryHooks,
   useAwaitNextBlock,
@@ -33,6 +29,7 @@ import {
   CreateDaoCustomValidator,
   DaoParentInfo,
   NewDao,
+  ProposalModuleAdapter,
 } from '@dao-dao/types'
 import { InstantiateMsg as CwdCoreV2InstantiateMsg } from '@dao-dao/types/contracts/CwdCore.v2'
 import instantiateSchema from '@dao-dao/types/contracts/CwdCore.v2.instantiate_schema.json'
@@ -51,21 +48,22 @@ import {
   processError,
   validateUrl,
 } from '@dao-dao/utils'
+
+import {
+  DefaultNewDao,
+  daoCreatedCardPropsAtom,
+  newDaoAtom,
+} from '../atoms/newDao'
+import { getAdapterById as getProposalModuleAdapterById } from '../proposal-module-adapter'
 import {
   CwdVotingCw20StakedAdapter,
   getAdapterById as getVotingModuleAdapterById,
   getAdapters as getVotingModuleAdapters,
-} from '@dao-dao/voting-module-adapter'
+} from '../voting-module-adapter'
 import {
   DaoCreationConfig as CwdVotingCw20StakedCreationConfig,
   GovernanceTokenType,
-} from '@dao-dao/voting-module-adapter/adapters/CwdVotingCw20Staked/types'
-
-import {
-  DefaultNewDao,
-  daoCreatedCardPropsAtom,
-  newDaoAtom,
-} from '../atoms/newDao'
+} from '../voting-module-adapter/adapters/CwdVotingCw20Staked/types'
 import { SuspenseLoader } from './SuspenseLoader'
 
 // i18n keys

diff --git a/packages/common/components/DaoInfoBar.tsx b/packages/common/components/DaoInfoBar.tsx
@@ -12,12 +12,12 @@ import {
   useDaoInfoContext,
 } from '@dao-dao/stateless'
 import { loadableToLoadingData } from '@dao-dao/utils'
+
 import {
   useCw20GovernanceTokenInfoResponseIfExists,
   useVotingModuleAdapter,
-} from '@dao-dao/voting-module-adapter'
-import { useVotingModuleAdapterOptions } from '@dao-dao/voting-module-adapter/react/context'
-
+} from '../voting-module-adapter'
+import { useVotingModuleAdapterOptions } from '../voting-module-adapter/react/context'
 import { SuspenseLoader } from './SuspenseLoader'
 
 export const DaoInfoBar = (props: InnerDaoInfoBarProps) => {

diff --git a/packages/common/components/DaoPageWrapper.tsx b/packages/common/components/DaoPageWrapper.tsx
@@ -19,9 +19,9 @@ import {
   DaoInfo,
   DaoInfoSerializable,
 } from '@dao-dao/types'
-import { VotingModuleAdapterProvider } from '@dao-dao/voting-module-adapter'
 
 import { ActionsProvider } from '../actions'
+import { VotingModuleAdapterProvider } from '../voting-module-adapter'
 import { SuspenseLoader } from './SuspenseLoader'
 import { Trans } from './Trans'
 

diff --git a/packages/common/components/ProposalLine.tsx b/packages/common/components/ProposalLine.tsx
@@ -1,10 +1,5 @@
 import { ComponentType } from 'react'
 
-import { SuspenseLoader } from '@dao-dao/common'
-import {
-  ProposalModuleAdapterProvider,
-  useProposalModuleAdapter,
-} from '@dao-dao/proposal-module-adapter'
 import {
   Loader as DefaultLoader,
   Logo as DefaultLogo,
@@ -14,6 +9,12 @@ import {
 } from '@dao-dao/stateless'
 import { ProposalModule } from '@dao-dao/types'
 
+import {
+  ProposalModuleAdapterProvider,
+  useProposalModuleAdapter,
+} from '../proposal-module-adapter'
+import { SuspenseLoader } from './SuspenseLoader'
+
 export interface ProposalLineProps {
   chainId: string
   coreAddress: string

diff --git a/packages/common/components/ProposalList.tsx b/packages/common/components/ProposalList.tsx
@@ -4,8 +4,6 @@
 import { useEffect, useMemo, useState } from 'react'
 import { useRecoilCallback } from 'recoil'
 
-import { ProposalLine, ProposalLineProps } from '@dao-dao/common'
-import { matchAndLoadCommon } from '@dao-dao/proposal-module-adapter'
 import { useVotingModule } from '@dao-dao/state'
 import {
   Loader,
@@ -14,6 +12,9 @@ import {
   useDaoInfoContext,
 } from '@dao-dao/stateless'
 
+import { matchAndLoadCommon } from '../proposal-module-adapter'
+import { ProposalLine, ProposalLineProps } from './ProposalLine'
+
 // Contracts enforce a max of 30, though this is on the edge for DAOs with
 // proposals that have a large size.
 const PROP_LOAD_LIMIT = 20

diff --git a/packages/common/hooks/useEncodedCwdProposalSinglePrefill.ts b/packages/common/hooks/useEncodedCwdProposalSinglePrefill.ts
@@ -1,10 +1,11 @@
+import { useDaoInfoContext } from '@dao-dao/stateless'
+import { Action, ProposalPrefill } from '@dao-dao/types'
+
 import {
   CwdProposalSingleAdapter,
   matchAdapter as matchProposalModuleAdapter,
-} from '@dao-dao/proposal-module-adapter'
-import { NewProposalForm } from '@dao-dao/proposal-module-adapter/adapters/CwdProposalSingle/types'
-import { useDaoInfoContext } from '@dao-dao/stateless'
-import { Action, ProposalPrefill } from '@dao-dao/types'
+} from '../proposal-module-adapter'
+import { NewProposalForm } from '../proposal-module-adapter/adapters/CwdProposalSingle/types'
 
 interface ActionAndData<Data extends {} = any> {
   action: Action<Data, any>

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -8,17 +8,17 @@
   "dependencies": {
     "@cosmjs/encoding": "0.28.10",
     "@cosmjs/stargate": "0.28.10",
-    "@dao-dao/proposal-module-adapter": "2.0.1",
     "@dao-dao/state": "2.0.1",
     "@dao-dao/stateless": "2.0.1",
     "@dao-dao/utils": "2.0.1",
-    "@dao-dao/voting-module-adapter": "2.0.1",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.3",
     "@mui/material": "^5.10.3",
     "@walletconnect/browser-utils": "^1.8.0",
     "axios": "^0.26.1",
+    "a11y-react-emoji": "^1.2.0",
+    "buffer": "^6.0.3",
     "clsx": "^1.1.1",
     "fuse.js": "^6.6.2",
     "i18next": "^21.8.10",
@@ -28,6 +28,7 @@
     "react-hook-form": "7.20.4",
     "react-hot-toast": "^2.1.1",
     "react-i18next": "^11.0.0",
+    "react-timeago": "^7.1.0",
     "recoil": "^0.7.2",
     "remove-markdown": "^0.5.0"
   },