Simplify

oasisprotocol · Oct 4, 2024 · 9e569c6 · 9e569c6
1 parent 1cfffdd
commit 9e569c6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 25 deletions.
diff --git a/frontend/src/components/ACLs/common.ts b/frontend/src/components/ACLs/common.ts
@@ -7,7 +7,7 @@ export type StatusUpdater = (status: string | undefined) => void
 /**
  * This data structure describes an ACL
  */
-export type ACL<Name, ConfigInputValues, Options extends AclOptions, Extra> = Choice<Name> & {
+export type ACL<Name, ConfigInputValues, Options extends AclOptions> = Choice<Name> & {
   /**
    * Estimated cost per vote
    *
@@ -56,13 +56,11 @@ export type ACL<Name, ConfigInputValues, Options extends AclOptions, Extra> = Ch
     proposalId: string,
     userAddress: string,
     options: Options,
-  ) => Promise<
-    { canVote: DecisionWithReason; explanation?: ReactNode; proof: BytesLike; error?: string } & Extra
-  >
+  ) => Promise<{ canVote: DecisionWithReason; explanation?: ReactNode; proof: BytesLike; error?: string }>
 }
 
-export function defineACL<Name, ConfigInputValues, Options extends AclOptions, Extra>(
-  acl: ACL<Name, ConfigInputValues, Options, Extra>,
-): ACL<Name, ConfigInputValues, Options, Extra> {
+export function defineACL<Name, ConfigInputValues, Options extends AclOptions>(
+  acl: ACL<Name, ConfigInputValues, Options>,
+): ACL<Name, ConfigInputValues, Options> {
   return acl
 }
diff --git a/frontend/src/components/ACLs/xchain.tsx b/frontend/src/components/ACLs/xchain.tsx
@@ -323,17 +323,17 @@ export const xchain = defineACL({
   isThisMine: options => 'xchain' in options,
 
   checkPermission: async (pollACL, daoAddress, proposalId, userAddress, options) => {
-    const xChainOptions = options
+    const { xchain } = options
+    const chainId = xchain.c
+    const blockHash = hexlify(xchain.b)
+    const tokenAddress = hexlify(xchain.a)
+    const slot = xchain.s
+
     let explanation: ReactNode = ''
     let error = ''
     let proof: BytesLike = ''
     let tokenInfo: TokenInfo | NFTInfo | undefined
     let canVote: DecisionWithReason = true
-    const {
-      xchain: { c: chainId, s: slot },
-    } = xChainOptions
-    const tokenAddress = hexlify(xChainOptions.xchain.a)
-    const blockHash = hexlify(xChainOptions.xchain.b)
     const provider = xchainRPC(chainId)
     const chainDefinition = getChainDefinition(chainId)
 
@@ -343,8 +343,6 @@ export const xchain = defineACL({
         explanation: 'This poll is invalid, since it references and unknown chain.',
         error,
         proof,
-        tokenInfo,
-        xChainOptions,
       }
     }
 
@@ -408,6 +406,6 @@ export const xchain = defineACL({
       console.error('proof:', proof)
       canVote = denyWithReason(`there was a technical problem verifying your permissions`)
     }
-    return { canVote, explanation, error, proof, tokenInfo, xChainOptions }
+    return { canVote, explanation, error, proof }
   },
 } as const)
diff --git a/frontend/src/hooks/usePollPermissions.ts b/frontend/src/hooks/usePollPermissions.ts
@@ -13,8 +13,6 @@ const blackPermissions: PollPermissions = {
   proof: '',
   explanation: undefined,
   canVote: denyWithReason(NOT_CHECKED),
-  tokenInfo: undefined,
-  xChainOptions: undefined,
   canManage: false,
   error: '',
 }
@@ -49,8 +47,6 @@ export const usePollPermissions = (poll: ExtendedPoll | undefined, onDashboard:
         proof: '',
         explanation: '',
         canVote: true,
-        tokenInfo: undefined,
-        xChainOptions: undefined,
         canManage: false,
         error: '',
       })

diff --git a/frontend/src/utils/poll.utils.ts b/frontend/src/utils/poll.utils.ts
@@ -15,7 +15,6 @@ import {
   guessStorageSlot,
   getNftContractType,
   ChainDefinition,
-  AclOptionsXchain,
   IPollACL__factory,
   TokenInfo,
   NFTInfo,
@@ -286,8 +285,6 @@ export type PollPermissions = {
   explanation: ReactNode
   canVote: DecisionWithReason
   canManage: boolean
-  tokenInfo?: TokenInfo | NFTInfo | undefined
-  xChainOptions?: AclOptionsXchain | undefined
   error: string
 }
 
@@ -322,8 +319,6 @@ export const checkPollPermission = async (
       canVote: denyWithReason(
         'this poll has some unknown access control settings. (Poll created by newer version of software?)',
       ),
-      tokenInfo: undefined,
-      xChainOptions: undefined,
       error: '',
       canManage,
     }