save and use chainId of granted Permissions

reown-com · Sep 20, 2024 · 5800cc0 · 5800cc0
1 parent 6078803
commit 5800cc0
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 15 deletions.
diff --git a/apps/laboratory/src/components/Wagmi/WagmiPurchaseDonutAsyncPermissionsTest.tsx b/apps/laboratory/src/components/Wagmi/WagmiPurchaseDonutAsyncPermissionsTest.tsx
@@ -1,5 +1,4 @@
 import { Button, Flex, Stack, Text } from '@chakra-ui/react'
-import { useAccount } from 'wagmi'
 import { useReadContract } from 'wagmi'
 import { useState } from 'react'
 import { useChakraToast } from '../Toast'
@@ -8,10 +7,10 @@ import { abi as donutContractAbi, address as donutContractaddress } from '../../
 import { useLocalEcdsaKey } from '../../context/LocalEcdsaKeyContext'
 import { useERC7715Permissions } from '../../hooks/useERC7715Permissions'
 import { executeActionsWithECDSAAndCosignerPermissions } from '../../utils/ERC7715Utils'
+import { getChain } from '../../utils/NetworksUtil'
 
 export function WagmiPurchaseDonutAsyncPermissionsTest() {
   const { privateKey } = useLocalEcdsaKey()
-  const { chain } = useAccount()
   const { grantedPermissions, pci } = useERC7715Permissions()
 
   const {
@@ -23,7 +22,7 @@ export function WagmiPurchaseDonutAsyncPermissionsTest() {
     abi: donutContractAbi,
     address: donutContractaddress,
     functionName: 'getBalance',
-    args: [grantedPermissions?.signerData?.submitToAddress || '0x']
+    args: [grantedPermissions?.permissions?.signerData?.submitToAddress || '0x']
   })
 
   const [isTransactionPending, setTransactionPending] = useState<boolean>(false)
@@ -32,8 +31,13 @@ export function WagmiPurchaseDonutAsyncPermissionsTest() {
   async function onPurchaseDonutWithPermissions() {
     setTransactionPending(true)
     try {
+      const chainId = grantedPermissions?.chainId
+      if (!chainId) {
+        throw new Error('Chain ID not available for granted permissions')
+      }
+      const chain = getChain(chainId)
       if (!chain) {
-        throw new Error(`Account connected chain not available`)
+        throw new Error('Invalid chain')
       }
       if (!privateKey) {
         throw new Error(`Unable to get dApp private key`)
@@ -60,7 +64,7 @@ export function WagmiPurchaseDonutAsyncPermissionsTest() {
         actions: purchaseDonutCallDataExecution,
         chain,
         ecdsaPrivateKey: privateKey as `0x${string}`,
-        permissions: grantedPermissions,
+        permissions: grantedPermissions.permissions,
         pci
       })
       if (txHash) {
@@ -91,7 +95,7 @@ export function WagmiPurchaseDonutAsyncPermissionsTest() {
   return (
     <Stack direction={['column', 'column', 'row']}>
       <Button
-        isDisabled={!grantedPermissions}
+        isDisabled={!grantedPermissions?.permissions || !grantedPermissions.chainId}
         isLoading={isTransactionPending}
         onClick={onPurchaseDonutWithPermissions}
       >

diff --git a/apps/laboratory/src/components/Wagmi/WagmiPurchaseDonutSyncPermissionsTest.tsx b/apps/laboratory/src/components/Wagmi/WagmiPurchaseDonutSyncPermissionsTest.tsx
@@ -6,8 +6,8 @@ import { encodeFunctionData, parseEther } from 'viem'
 import { abi as donutContractAbi, address as donutContractaddress } from '../../utils/DonutContract'
 import { useERC7715Permissions } from '../../hooks/useERC7715Permissions'
 import { usePasskey } from '../../context/PasskeyContext'
-import { sepolia } from 'viem/chains'
 import { executeActionsWithPasskeyAndCosignerPermissions } from '../../utils/ERC7715Utils'
+import { getChain } from '../../utils/NetworksUtil'
 
 export function WagmiPurchaseDonutSyncPermissionsTest() {
   const { passkeyId } = usePasskey()
@@ -22,7 +22,7 @@ export function WagmiPurchaseDonutSyncPermissionsTest() {
     abi: donutContractAbi,
     address: donutContractaddress,
     functionName: 'getBalance',
-    args: [grantedPermissions?.signerData?.submitToAddress || '0x']
+    args: [grantedPermissions?.permissions?.signerData?.submitToAddress || '0x']
   })
 
   const [isTransactionPending, setTransactionPending] = useState<boolean>(false)
@@ -34,6 +34,14 @@ export function WagmiPurchaseDonutSyncPermissionsTest() {
       if (!grantedPermissions) {
         throw Error('No permissions available')
       }
+      const chainId = grantedPermissions?.chainId
+      if (!chainId) {
+        throw new Error('Chain ID not available for granted permissions')
+      }
+      const chain = getChain(chainId)
+      if (!chain) {
+        throw new Error('Invalid chain')
+      }
       if (!pci) {
         throw Error('No WC cosigner data(PCI) available')
       }
@@ -52,9 +60,9 @@ export function WagmiPurchaseDonutSyncPermissionsTest() {
       ]
       const txHash = await executeActionsWithPasskeyAndCosignerPermissions({
         actions: purchaseDonutCallDataExecution,
-        chain: sepolia,
+        chain,
         passkeyId,
-        permissions: grantedPermissions,
+        permissions: grantedPermissions.permissions,
         pci
       })
       if (txHash) {
@@ -86,7 +94,7 @@ export function WagmiPurchaseDonutSyncPermissionsTest() {
   return (
     <Stack direction={['column', 'column', 'row']}>
       <Button
-        isDisabled={!grantedPermissions}
+        isDisabled={!grantedPermissions?.permissions || !grantedPermissions.chainId}
         isLoading={isTransactionPending}
         onClick={onPurchaseDonutWithPermissions}
       >

diff --git a/apps/laboratory/src/context/ERC7715PermissionsContext.tsx b/apps/laboratory/src/context/ERC7715PermissionsContext.tsx
@@ -11,9 +11,9 @@ import type { AddPermissionResponse } from '../utils/WalletConnectCosignerUtils'
 
 export type ERC7715PermissionsContextType = {
   projectId: string
-  grantedPermissions: GrantPermissionsReturnType | undefined
+  grantedPermissions: { permissions: GrantPermissionsReturnType; chainId: number } | undefined
   setGrantedPermissions: React.Dispatch<
-    React.SetStateAction<GrantPermissionsReturnType | undefined>
+    React.SetStateAction<{ permissions: GrantPermissionsReturnType; chainId: number } | undefined>
   >
   wcCosignerData: AddPermissionResponse | undefined
   setWCCosignerData: React.Dispatch<React.SetStateAction<AddPermissionResponse | undefined>>
@@ -41,7 +41,7 @@ export function ERC7715PermissionsProvider({ children }: ERC7715PermissionsProvi
     throw new Error('NEXT_PUBLIC_PROJECT_ID is not set')
   }
   const [grantedPermissions, setGrantedPermissions] = useLocalStorageState<
-    GrantPermissionsReturnType | undefined
+    { permissions: GrantPermissionsReturnType; chainId: number } | undefined
   >(GRANTED_PERMISSIONS_KEY, undefined)
   const [wcCosignerData, setWCCosignerData] = useLocalStorageState<
     AddPermissionResponse | undefined

diff --git a/apps/laboratory/src/hooks/useERC7715Permissions.ts b/apps/laboratory/src/hooks/useERC7715Permissions.ts
@@ -94,7 +94,10 @@ export function useERC7715Permissions() {
         factoryData: approvedPermissions.factoryData || ''
       }
     })
-    setGrantedPermissions(approvedPermissions)
+    setGrantedPermissions({
+      permissions: approvedPermissions,
+      chainId: chain.id
+    })
 
     return { approvedPermissions }
   }