Remove redundant NarrowAbiToFunction utility type

Author: jeffsmale90

packages/smart-accounts-kit/src/DelegationFramework/DeleGatorCore/methods/disableDelegation.ts

@@ -6,7 +6,6 @@ import { simulateContract, writeContract } from 'viem/actions';
 import { toDelegationStruct } from '../../../delegation';
 import type { Delegation } from '../../../types';
 import type { InitializedClient } from '../../types';
-import type { NarrowAbiToFunction } from '../../utils';
 
 export type SimulateDisableDelegationParameters = {
   client: Client;
@@ -29,16 +28,11 @@ export const simulate = async ({
   delegationManagerAddress,
   delegation,
 }: SimulateDisableDelegationParameters) => {
-  const abi = DeleGatorCore as any as NarrowAbiToFunction<
-    typeof DeleGatorCore,
-    'disableDelegation'
-  >;
-
   const delegationStruct = toDelegationStruct(delegation);
 
   return simulateContract(client, {
     address: delegationManagerAddress,
-    abi,
+    abi: DeleGatorCore,
     functionName: 'disableDelegation',
     args: [delegationStruct],
   });

packages/smart-accounts-kit/src/DelegationFramework/DeleGatorCore/methods/enableDelegation.ts

@@ -6,7 +6,6 @@ import { simulateContract, writeContract } from 'viem/actions';
 import { toDelegationStruct } from '../../../delegation';
 import type { Delegation } from '../../../types';
 import type { InitializedClient } from '../../types';
-import type { NarrowAbiToFunction } from '../../utils';
 
 export type SimulateEnableDelegationParameters = {
   client: Client;
@@ -29,16 +28,11 @@ export const simulate = async ({
   delegationManagerAddress,
   delegation,
 }: SimulateEnableDelegationParameters) => {
-  const abi = DeleGatorCore as any as NarrowAbiToFunction<
-    typeof DeleGatorCore,
-    'enableDelegation'
-  >;
-
   const delegationStruct = toDelegationStruct(delegation);
 
   return simulateContract(client, {
     address: delegationManagerAddress,
-    abi,
+    abi: DeleGatorCore,
     functionName: 'enableDelegation',
     args: [delegationStruct],
   });

packages/smart-accounts-kit/src/DelegationFramework/DelegationManager/methods/disableDelegation.ts

@@ -6,7 +6,6 @@ import { simulateContract, writeContract } from 'viem/actions';
 import { toDelegationStruct } from '../../../delegation';
 import type { Delegation } from '../../../types';
 import type { InitializedClient } from '../../types';
-import type { NarrowAbiToFunction } from '../../utils';
 
 export type EncodeDisableDelegationParameters = {
   delegation: Delegation;
@@ -27,16 +26,11 @@ export const simulate = async ({
   delegationManagerAddress,
   delegation,
 }: SimulateDisableDelegationParameters) => {
-  const abi = DelegationManager as any as NarrowAbiToFunction<
-    typeof DelegationManager,
-    'disableDelegation'
-  >;
-
   const delegationStruct = toDelegationStruct(delegation);
 
   return simulateContract(client, {
     address: delegationManagerAddress,
-    abi,
+    abi: DelegationManager,
     functionName: 'disableDelegation',
     args: [delegationStruct],
   });

packages/smart-accounts-kit/src/DelegationFramework/DelegationManager/methods/enableDelegation.ts

@@ -6,7 +6,6 @@ import { simulateContract, writeContract } from 'viem/actions';
 import { toDelegationStruct } from '../../../delegation';
 import type { Delegation } from '../../../types';
 import type { InitializedClient } from '../../types';
-import type { NarrowAbiToFunction } from '../../utils';
 
 export type EncodeEnableDelegationParameters = {
   delegation: Delegation;
@@ -27,16 +26,11 @@ export const simulate = async ({
   delegationManagerAddress,
   delegation,
 }: SimulateEnableDelegationParameters) => {
-  const abi = DelegationManager as any as NarrowAbiToFunction<
-    typeof DelegationManager,
-    'enableDelegation'
-  >;
-
   const delegationStruct = toDelegationStruct(delegation);
 
   return simulateContract(client, {
     address: delegationManagerAddress,
-    abi,
+    abi: DelegationManager,
     functionName: 'enableDelegation',
     args: [delegationStruct],
   });

packages/smart-accounts-kit/src/DelegationFramework/DelegationManager/methods/redeemDelegations.ts

@@ -8,7 +8,6 @@ import { encodeExecutionCalldatas } from '../../../executions';
 import type { ExecutionMode, ExecutionStruct } from '../../../executions';
 import type { Delegation } from '../../../types';
 import type { InitializedClient } from '../../types';
-import type { NarrowAbiToFunction } from '../../utils';
 
 export type EncodeRedeemDelegationsParameters = {
   delegations: Delegation[][];
@@ -33,14 +32,9 @@ export const simulate = async ({
   modes,
   executions,
 }: SimulateRedeemDelegationsParameters) => {
-  const abi = DelegationManager as any as NarrowAbiToFunction<
-    typeof DelegationManager,
-    'redeemDelegations'
-  >;
-
   return simulateContract(client, {
     address: delegationManagerAddress,
-    abi,
+    abi: DelegationManager,
     functionName: 'redeemDelegations',
     args: [
       encodePermissionContexts(delegations),

packages/smart-accounts-kit/src/DelegationFramework/utils.ts

@@ -1,28 +1,11 @@
 import { ERC1967Proxy } from '@metamask/delegation-abis';
 import { ERC1967Proxy as ERC1967ProxyBytecode } from '@metamask/delegation-abis/bytecode';
-import type { Abi, Address, Client, Hex } from 'viem';
+import type { Address, Client, Hex } from 'viem';
 import { encodeDeployData } from 'viem';
 import { getCode } from 'viem/actions';
 
 import { getProxyImplementation } from './DeleGatorCore/read';
 
-// Where a function signature is duplicated across contracts, we need to narrow
-// the ABI type passed as the `simulateContract` generic argument. Without this,
-// the `simulate()` return type would not match, despite being functionally
-// identical.
-export type NarrowAbiToFunction<
-  TAbi extends Abi,
-  FunctionName extends string,
-> = [
-  Extract<
-    TAbi[number],
-    {
-      type: 'function';
-      name: FunctionName;
-    }
-  >[],
-];
-
 /**
  * Checks if a contract is deployed at the given address.
  *
@@ -95,5 +78,5 @@ export const encodeProxyCreationCode = ({
   encodeDeployData({
     abi: ERC1967Proxy,
     args: [implementationAddress, initcode],
-    bytecode: ERC1967ProxyBytecode as Hex,
+    bytecode: ERC1967ProxyBytecode,
   });

packages/smart-accounts-kit/src/contracts/index.ts

@@ -25,8 +25,6 @@ export {
   encodeProxyCreationCode,
 } from '../DelegationFramework/utils';
 
-export type { NarrowAbiToFunction } from '../DelegationFramework/utils';
-
 export {
   DelegationManager,
   DeleGatorCore,