Update e2e test suite to use new interface

Author: jeffsmale90

packages/delegator-e2e/test/addP256KeyHybridDeleGator.test.ts

@@ -79,7 +79,7 @@ test('maincase: Change the keys on a deployed gator', async () => {
 
   const aliceContract = getContract({
     address,
-    abi: HybridDeleGator.abi,
+    abi: HybridDeleGator,
     client: publicClient,
   });
 
@@ -96,7 +96,7 @@ test('maincase: Change the keys on a deployed gator', async () => {
       {
         to: aliceContract.address,
         data: encodeFunctionData({
-          abi: HybridDeleGator.abi,
+          abi: HybridDeleGator,
           functionName: 'addKey',
           args: [KEY_ID, P256_X, P256_Y],
         }),

packages/delegator-e2e/test/caveats/allowedMethods.test.ts

@@ -384,7 +384,7 @@ const runScopeTest_expectFailure = async (
     target: aliceCounter.address,
     value: 0n,
     callData: encodeFunctionData({
-      abi: CounterMetadata.abi as AbiFunction[],
+      abi: CounterMetadata.abi,
       functionName: 'setCount',
       args: [42n],
     }),

packages/delegator-e2e/test/caveats/nonce.test.ts

@@ -258,7 +258,7 @@ const incrementNonce = async () => {
       {
         to: environment.caveatEnforcers.NonceEnforcer!,
         data: encodeFunctionData({
-          abi: NonceEnforcer.abi,
+          abi: NonceEnforcer,
           functionName: 'incrementNonce',
           args: [environment.DelegationManager],
         }),
@@ -397,7 +397,7 @@ describe('NonceEnforcer Contract Read Methods', () => {
           {
             to: charlieSmartAccount.environment.caveatEnforcers.NonceEnforcer!,
             data: encodeFunctionData({
-              abi: NonceEnforcer.abi,
+              abi: NonceEnforcer,
               functionName: 'incrementNonce',
               args: [charlieSmartAccount.environment.DelegationManager],
             }),
@@ -461,7 +461,7 @@ describe('NonceEnforcer Contract Read Methods', () => {
   test('encode function produces correct calldata for incrementNonce', async () => {
     // Test the encode utility function
     const expectedCalldata = encodeFunctionData({
-      abi: NonceEnforcer.abi,
+      abi: NonceEnforcer,
       functionName: 'incrementNonce',
       args: [aliceSmartAccount.environment.DelegationManager],
     });

packages/delegator-e2e/test/utils/helpers.ts

@@ -144,7 +144,7 @@ export type CounterContract = GetContractReturnType<
 export const deployCounter = async (owner: Hex) => {
   // Deploy the counter contract using Viem's deployContract
   const hash = await deployerClient.deployContract({
-    abi: CounterMetadata.abi as Abi,
+    abi: CounterMetadata.abi,
     bytecode: CounterMetadata.bytecode.object as Hex,
   });