@argent/x-shared 1.70.3 → 1.72.0

package/dist/src/features/simulation/fees/schema.d.ts

@@ -1,258 +1,79 @@
 import { z } from 'zod';
-import { UnionEvaluate } from '../../../utils/type.utils';
-export declare const estimatedFeeSchema: z.ZodObject<{
-    feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
-    amount: z.ZodBigInt;
-    pricePerUnit: z.ZodBigInt;
-    max: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-        amount: z.ZodBigInt;
-        pricePerUnit: z.ZodBigInt;
-    }, "strip", z.ZodTypeAny, {
-        amount: bigint;
-        pricePerUnit: bigint;
-    }, {
-        amount: bigint;
-        pricePerUnit: bigint;
-    }>, z.ZodObject<{
-        maxFee: z.ZodBigInt;
-    }, "strip", z.ZodTypeAny, {
-        maxFee: bigint;
-    }, {
-        maxFee: bigint;
-    }>]>>;
-    dataGasConsumed: z.ZodOptional<z.ZodBigInt>;
-    dataGasPrice: z.ZodOptional<z.ZodBigInt>;
+import { StrictOmit, UnionEvaluate } from '../../../utils/type.utils';
+export declare const resourceBoundsSchema: z.ZodObject<{
+    gasConsumed: z.ZodBigInt;
+    gasPrice: z.ZodBigInt;
 }, "strip", z.ZodTypeAny, {
-    amount: bigint;
-    pricePerUnit: bigint;
-    feeTokenAddress: `0x${string}`;
-    max?: {
-        amount: bigint;
-        pricePerUnit: bigint;
-    } | {
-        maxFee: bigint;
-    } | undefined;
-    dataGasConsumed?: bigint | undefined;
-    dataGasPrice?: bigint | undefined;
+    gasConsumed: bigint;
+    gasPrice: bigint;
 }, {
-    amount: bigint;
-    pricePerUnit: bigint;
-    feeTokenAddress: string;
-    max?: {
-        amount: bigint;
-        pricePerUnit: bigint;
-    } | {
-        maxFee: bigint;
-    } | undefined;
-    dataGasConsumed?: bigint | undefined;
-    dataGasPrice?: bigint | undefined;
+    gasConsumed: bigint;
+    gasPrice: bigint;
 }>;
-export type EstimatedFee = z.infer<typeof estimatedFeeSchema>;
-export declare const estimatedFeesSchema: z.ZodObject<{
-    deployment: z.ZodOptional<z.ZodObject<{
-        feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
-        amount: z.ZodBigInt;
-        pricePerUnit: z.ZodBigInt;
-        max: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-            amount: z.ZodBigInt;
-            pricePerUnit: z.ZodBigInt;
-        }, "strip", z.ZodTypeAny, {
-            amount: bigint;
-            pricePerUnit: bigint;
-        }, {
-            amount: bigint;
-            pricePerUnit: bigint;
-        }>, z.ZodObject<{
-            maxFee: z.ZodBigInt;
-        }, "strip", z.ZodTypeAny, {
-            maxFee: bigint;
-        }, {
-            maxFee: bigint;
-        }>]>>;
-        dataGasConsumed: z.ZodOptional<z.ZodBigInt>;
-        dataGasPrice: z.ZodOptional<z.ZodBigInt>;
-    }, "strip", z.ZodTypeAny, {
-        amount: bigint;
-        pricePerUnit: bigint;
-        feeTokenAddress: `0x${string}`;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
-    }, {
-        amount: bigint;
-        pricePerUnit: bigint;
-        feeTokenAddress: string;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
-    }>>;
-    transactions: z.ZodObject<{
-        feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
-        amount: z.ZodBigInt;
-        pricePerUnit: z.ZodBigInt;
-        max: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-            amount: z.ZodBigInt;
-            pricePerUnit: z.ZodBigInt;
-        }, "strip", z.ZodTypeAny, {
-            amount: bigint;
-            pricePerUnit: bigint;
-        }, {
-            amount: bigint;
-            pricePerUnit: bigint;
-        }>, z.ZodObject<{
-            maxFee: z.ZodBigInt;
-        }, "strip", z.ZodTypeAny, {
-            maxFee: bigint;
-        }, {
-            maxFee: bigint;
-        }>]>>;
-        dataGasConsumed: z.ZodOptional<z.ZodBigInt>;
-        dataGasPrice: z.ZodOptional<z.ZodBigInt>;
+export type ResourceBounds = z.infer<typeof resourceBoundsSchema>;
+export declare const nativeEstimatedFeeSchema: z.ZodObject<{
+    type: z.ZodLiteral<"native">;
+    feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
+    l1Gas: z.ZodObject<{
+        gasConsumed: z.ZodBigInt;
+        gasPrice: z.ZodBigInt;
     }, "strip", z.ZodTypeAny, {
-        amount: bigint;
-        pricePerUnit: bigint;
-        feeTokenAddress: `0x${string}`;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        gasConsumed: bigint;
+        gasPrice: bigint;
     }, {
-        amount: bigint;
-        pricePerUnit: bigint;
-        feeTokenAddress: string;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        gasConsumed: bigint;
+        gasPrice: bigint;
     }>;
-}, "strip", z.ZodTypeAny, {
-    transactions: {
-        amount: bigint;
-        pricePerUnit: bigint;
-        feeTokenAddress: `0x${string}`;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
-    };
-    deployment?: {
-        amount: bigint;
-        pricePerUnit: bigint;
-        feeTokenAddress: `0x${string}`;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
-    } | undefined;
-}, {
-    transactions: {
-        amount: bigint;
-        pricePerUnit: bigint;
-        feeTokenAddress: string;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
-    };
-    deployment?: {
-        amount: bigint;
-        pricePerUnit: bigint;
-        feeTokenAddress: string;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
-    } | undefined;
-}>;
-export type EstimatedFees = z.infer<typeof estimatedFeesSchema>;
-export interface EstimatedFeesEnriched extends EstimatedFees {
-    id: string;
-    timestamp: number;
-}
-export declare const nativeEstimatedFeeSchema: z.ZodObject<z.objectUtil.extendShape<{
-    feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
-    amount: z.ZodBigInt;
-    pricePerUnit: z.ZodBigInt;
-    max: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-        amount: z.ZodBigInt;
-        pricePerUnit: z.ZodBigInt;
+    l2Gas: z.ZodObject<{
+        gasConsumed: z.ZodBigInt;
+        gasPrice: z.ZodBigInt;
     }, "strip", z.ZodTypeAny, {
-        amount: bigint;
-        pricePerUnit: bigint;
+        gasConsumed: bigint;
+        gasPrice: bigint;
     }, {
-        amount: bigint;
-        pricePerUnit: bigint;
-    }>, z.ZodObject<{
-        maxFee: z.ZodBigInt;
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    }>;
+    l1DataGas: z.ZodObject<{
+        gasConsumed: z.ZodBigInt;
+        gasPrice: z.ZodBigInt;
     }, "strip", z.ZodTypeAny, {
-        maxFee: bigint;
+        gasConsumed: bigint;
+        gasPrice: bigint;
     }, {
-        maxFee: bigint;
-    }>]>>;
-    dataGasConsumed: z.ZodOptional<z.ZodBigInt>;
-    dataGasPrice: z.ZodOptional<z.ZodBigInt>;
-}, {
-    type: z.ZodLiteral<"native">;
-}>, "strip", z.ZodTypeAny, {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    }>;
+}, "strip", z.ZodTypeAny, {
     type: "native";
-    amount: bigint;
-    pricePerUnit: bigint;
     feeTokenAddress: `0x${string}`;
-    max?: {
-        amount: bigint;
-        pricePerUnit: bigint;
-    } | {
-        maxFee: bigint;
-    } | undefined;
-    dataGasConsumed?: bigint | undefined;
-    dataGasPrice?: bigint | undefined;
+    l1Gas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    l2Gas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    l1DataGas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
 }, {
     type: "native";
-    amount: bigint;
-    pricePerUnit: bigint;
     feeTokenAddress: string;
-    max?: {
-        amount: bigint;
-        pricePerUnit: bigint;
-    } | {
-        maxFee: bigint;
-    } | undefined;
-    dataGasConsumed?: bigint | undefined;
-    dataGasPrice?: bigint | undefined;
+    l1Gas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    l2Gas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    l1DataGas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
 }>;
 export declare const paymasterEstimatedFeeSchema: z.ZodObject<{
     type: z.ZodLiteral<"paymaster">;
@@ -261,65 +82,78 @@ export declare const paymasterEstimatedFeeSchema: z.ZodObject<{
     overallFee: z.ZodBigInt;
 }, "strip", z.ZodTypeAny, {
     type: "paymaster";
-    maxFee: bigint;
     feeTokenAddress: `0x${string}`;
+    maxFee: bigint;
     overallFee: bigint;
 }, {
     type: "paymaster";
-    maxFee: bigint;
     feeTokenAddress: string;
+    maxFee: bigint;
     overallFee: bigint;
 }>;
-export declare const estimatedFeeV2Schema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<z.objectUtil.extendShape<{
+export declare const estimatedFeeSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+    type: z.ZodLiteral<"native">;
     feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
-    amount: z.ZodBigInt;
-    pricePerUnit: z.ZodBigInt;
-    max: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-        amount: z.ZodBigInt;
-        pricePerUnit: z.ZodBigInt;
+    l1Gas: z.ZodObject<{
+        gasConsumed: z.ZodBigInt;
+        gasPrice: z.ZodBigInt;
     }, "strip", z.ZodTypeAny, {
-        amount: bigint;
-        pricePerUnit: bigint;
+        gasConsumed: bigint;
+        gasPrice: bigint;
     }, {
-        amount: bigint;
-        pricePerUnit: bigint;
-    }>, z.ZodObject<{
-        maxFee: z.ZodBigInt;
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    }>;
+    l2Gas: z.ZodObject<{
+        gasConsumed: z.ZodBigInt;
+        gasPrice: z.ZodBigInt;
     }, "strip", z.ZodTypeAny, {
-        maxFee: bigint;
+        gasConsumed: bigint;
+        gasPrice: bigint;
     }, {
-        maxFee: bigint;
-    }>]>>;
-    dataGasConsumed: z.ZodOptional<z.ZodBigInt>;
-    dataGasPrice: z.ZodOptional<z.ZodBigInt>;
-}, {
-    type: z.ZodLiteral<"native">;
-}>, "strip", z.ZodTypeAny, {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    }>;
+    l1DataGas: z.ZodObject<{
+        gasConsumed: z.ZodBigInt;
+        gasPrice: z.ZodBigInt;
+    }, "strip", z.ZodTypeAny, {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    }, {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    }>;
+}, "strip", z.ZodTypeAny, {
     type: "native";
-    amount: bigint;
-    pricePerUnit: bigint;
     feeTokenAddress: `0x${string}`;
-    max?: {
-        amount: bigint;
-        pricePerUnit: bigint;
-    } | {
-        maxFee: bigint;
-    } | undefined;
-    dataGasConsumed?: bigint | undefined;
-    dataGasPrice?: bigint | undefined;
+    l1Gas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    l2Gas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    l1DataGas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
 }, {
     type: "native";
-    amount: bigint;
-    pricePerUnit: bigint;
     feeTokenAddress: string;
-    max?: {
-        amount: bigint;
-        pricePerUnit: bigint;
-    } | {
-        maxFee: bigint;
-    } | undefined;
-    dataGasConsumed?: bigint | undefined;
-    dataGasPrice?: bigint | undefined;
+    l1Gas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    l2Gas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    l1DataGas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
 }>, z.ZodObject<{
     type: z.ZodLiteral<"paymaster">;
     feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
@@ -327,167 +161,205 @@ export declare const estimatedFeeV2Schema: z.ZodDiscriminatedUnion<"type", [z.Zo
     overallFee: z.ZodBigInt;
 }, "strip", z.ZodTypeAny, {
     type: "paymaster";
-    maxFee: bigint;
     feeTokenAddress: `0x${string}`;
+    maxFee: bigint;
     overallFee: bigint;
 }, {
     type: "paymaster";
-    maxFee: bigint;
     feeTokenAddress: string;
+    maxFee: bigint;
     overallFee: bigint;
 }>]>;
-export type EstimatedFeeV2 = z.infer<typeof estimatedFeeV2Schema>;
+export type EstimatedFee = z.infer<typeof estimatedFeeSchema>;
 export declare const nativeEstimatedFeesSchema: z.ZodObject<{
     type: z.ZodLiteral<"native">;
-    transactions: z.ZodObject<{
+    transactions: z.ZodObject<Omit<{
+        type: z.ZodLiteral<"native">;
         feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
-        amount: z.ZodBigInt;
-        pricePerUnit: z.ZodBigInt;
-        max: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-            amount: z.ZodBigInt;
-            pricePerUnit: z.ZodBigInt;
+        l1Gas: z.ZodObject<{
+            gasConsumed: z.ZodBigInt;
+            gasPrice: z.ZodBigInt;
         }, "strip", z.ZodTypeAny, {
-            amount: bigint;
-            pricePerUnit: bigint;
+            gasConsumed: bigint;
+            gasPrice: bigint;
         }, {
-            amount: bigint;
-            pricePerUnit: bigint;
-        }>, z.ZodObject<{
-            maxFee: z.ZodBigInt;
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }>;
+        l2Gas: z.ZodObject<{
+            gasConsumed: z.ZodBigInt;
+            gasPrice: z.ZodBigInt;
         }, "strip", z.ZodTypeAny, {
-            maxFee: bigint;
+            gasConsumed: bigint;
+            gasPrice: bigint;
         }, {
-            maxFee: bigint;
-        }>]>>;
-        dataGasConsumed: z.ZodOptional<z.ZodBigInt>;
-        dataGasPrice: z.ZodOptional<z.ZodBigInt>;
-    }, "strip", z.ZodTypeAny, {
-        amount: bigint;
-        pricePerUnit: bigint;
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }>;
+        l1DataGas: z.ZodObject<{
+            gasConsumed: z.ZodBigInt;
+            gasPrice: z.ZodBigInt;
+        }, "strip", z.ZodTypeAny, {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }, {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }>;
+    }, "type">, "strip", z.ZodTypeAny, {
         feeTokenAddress: `0x${string}`;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     }, {
-        amount: bigint;
-        pricePerUnit: bigint;
         feeTokenAddress: string;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     }>;
-    deployment: z.ZodOptional<z.ZodObject<{
+    deployment: z.ZodOptional<z.ZodObject<Omit<{
+        type: z.ZodLiteral<"native">;
         feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
-        amount: z.ZodBigInt;
-        pricePerUnit: z.ZodBigInt;
-        max: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-            amount: z.ZodBigInt;
-            pricePerUnit: z.ZodBigInt;
+        l1Gas: z.ZodObject<{
+            gasConsumed: z.ZodBigInt;
+            gasPrice: z.ZodBigInt;
         }, "strip", z.ZodTypeAny, {
-            amount: bigint;
-            pricePerUnit: bigint;
+            gasConsumed: bigint;
+            gasPrice: bigint;
         }, {
-            amount: bigint;
-            pricePerUnit: bigint;
-        }>, z.ZodObject<{
-            maxFee: z.ZodBigInt;
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }>;
+        l2Gas: z.ZodObject<{
+            gasConsumed: z.ZodBigInt;
+            gasPrice: z.ZodBigInt;
         }, "strip", z.ZodTypeAny, {
-            maxFee: bigint;
+            gasConsumed: bigint;
+            gasPrice: bigint;
         }, {
-            maxFee: bigint;
-        }>]>>;
-        dataGasConsumed: z.ZodOptional<z.ZodBigInt>;
-        dataGasPrice: z.ZodOptional<z.ZodBigInt>;
-    }, "strip", z.ZodTypeAny, {
-        amount: bigint;
-        pricePerUnit: bigint;
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }>;
+        l1DataGas: z.ZodObject<{
+            gasConsumed: z.ZodBigInt;
+            gasPrice: z.ZodBigInt;
+        }, "strip", z.ZodTypeAny, {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }, {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }>;
+    }, "type">, "strip", z.ZodTypeAny, {
         feeTokenAddress: `0x${string}`;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     }, {
-        amount: bigint;
-        pricePerUnit: bigint;
         feeTokenAddress: string;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     }>>;
 }, "strip", z.ZodTypeAny, {
     type: "native";
     transactions: {
-        amount: bigint;
-        pricePerUnit: bigint;
         feeTokenAddress: `0x${string}`;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     };
     deployment?: {
-        amount: bigint;
-        pricePerUnit: bigint;
         feeTokenAddress: `0x${string}`;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     } | undefined;
 }, {
     type: "native";
     transactions: {
-        amount: bigint;
-        pricePerUnit: bigint;
         feeTokenAddress: string;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     };
     deployment?: {
-        amount: bigint;
-        pricePerUnit: bigint;
         feeTokenAddress: string;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     } | undefined;
 }>;
 export declare const paymasterEstimatedFeesSchema: z.ZodObject<{
@@ -498,12 +370,12 @@ export declare const paymasterEstimatedFeesSchema: z.ZodObject<{
         maxFee: z.ZodBigInt;
         overallFee: z.ZodBigInt;
     }, "type">, "strip", z.ZodTypeAny, {
-        maxFee: bigint;
         feeTokenAddress: `0x${string}`;
+        maxFee: bigint;
         overallFee: bigint;
     }, {
-        maxFee: bigint;
         feeTokenAddress: string;
+        maxFee: bigint;
         overallFee: bigint;
     }>;
     deployment: z.ZodOptional<z.ZodObject<Omit<{
@@ -512,190 +384,228 @@ export declare const paymasterEstimatedFeesSchema: z.ZodObject<{
         maxFee: z.ZodBigInt;
         overallFee: z.ZodBigInt;
     }, "type">, "strip", z.ZodTypeAny, {
-        maxFee: bigint;
         feeTokenAddress: `0x${string}`;
+        maxFee: bigint;
         overallFee: bigint;
     }, {
-        maxFee: bigint;
         feeTokenAddress: string;
+        maxFee: bigint;
         overallFee: bigint;
     }>>;
 }, "strip", z.ZodTypeAny, {
     type: "paymaster";
     transactions: {
-        maxFee: bigint;
         feeTokenAddress: `0x${string}`;
+        maxFee: bigint;
         overallFee: bigint;
     };
     deployment?: {
-        maxFee: bigint;
         feeTokenAddress: `0x${string}`;
+        maxFee: bigint;
         overallFee: bigint;
     } | undefined;
 }, {
     type: "paymaster";
     transactions: {
-        maxFee: bigint;
         feeTokenAddress: string;
+        maxFee: bigint;
         overallFee: bigint;
     };
     deployment?: {
-        maxFee: bigint;
         feeTokenAddress: string;
+        maxFee: bigint;
         overallFee: bigint;
     } | undefined;
 }>;
-export declare const estimatedFeesV2Schema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+export declare const estimatedFeesSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"native">;
-    transactions: z.ZodObject<{
+    transactions: z.ZodObject<Omit<{
+        type: z.ZodLiteral<"native">;
         feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
-        amount: z.ZodBigInt;
-        pricePerUnit: z.ZodBigInt;
-        max: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-            amount: z.ZodBigInt;
-            pricePerUnit: z.ZodBigInt;
+        l1Gas: z.ZodObject<{
+            gasConsumed: z.ZodBigInt;
+            gasPrice: z.ZodBigInt;
         }, "strip", z.ZodTypeAny, {
-            amount: bigint;
-            pricePerUnit: bigint;
+            gasConsumed: bigint;
+            gasPrice: bigint;
         }, {
-            amount: bigint;
-            pricePerUnit: bigint;
-        }>, z.ZodObject<{
-            maxFee: z.ZodBigInt;
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }>;
+        l2Gas: z.ZodObject<{
+            gasConsumed: z.ZodBigInt;
+            gasPrice: z.ZodBigInt;
         }, "strip", z.ZodTypeAny, {
-            maxFee: bigint;
+            gasConsumed: bigint;
+            gasPrice: bigint;
         }, {
-            maxFee: bigint;
-        }>]>>;
-        dataGasConsumed: z.ZodOptional<z.ZodBigInt>;
-        dataGasPrice: z.ZodOptional<z.ZodBigInt>;
-    }, "strip", z.ZodTypeAny, {
-        amount: bigint;
-        pricePerUnit: bigint;
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }>;
+        l1DataGas: z.ZodObject<{
+            gasConsumed: z.ZodBigInt;
+            gasPrice: z.ZodBigInt;
+        }, "strip", z.ZodTypeAny, {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }, {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }>;
+    }, "type">, "strip", z.ZodTypeAny, {
         feeTokenAddress: `0x${string}`;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     }, {
-        amount: bigint;
-        pricePerUnit: bigint;
         feeTokenAddress: string;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     }>;
-    deployment: z.ZodOptional<z.ZodObject<{
+    deployment: z.ZodOptional<z.ZodObject<Omit<{
+        type: z.ZodLiteral<"native">;
         feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
-        amount: z.ZodBigInt;
-        pricePerUnit: z.ZodBigInt;
-        max: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-            amount: z.ZodBigInt;
-            pricePerUnit: z.ZodBigInt;
+        l1Gas: z.ZodObject<{
+            gasConsumed: z.ZodBigInt;
+            gasPrice: z.ZodBigInt;
         }, "strip", z.ZodTypeAny, {
-            amount: bigint;
-            pricePerUnit: bigint;
+            gasConsumed: bigint;
+            gasPrice: bigint;
         }, {
-            amount: bigint;
-            pricePerUnit: bigint;
-        }>, z.ZodObject<{
-            maxFee: z.ZodBigInt;
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }>;
+        l2Gas: z.ZodObject<{
+            gasConsumed: z.ZodBigInt;
+            gasPrice: z.ZodBigInt;
         }, "strip", z.ZodTypeAny, {
-            maxFee: bigint;
+            gasConsumed: bigint;
+            gasPrice: bigint;
         }, {
-            maxFee: bigint;
-        }>]>>;
-        dataGasConsumed: z.ZodOptional<z.ZodBigInt>;
-        dataGasPrice: z.ZodOptional<z.ZodBigInt>;
-    }, "strip", z.ZodTypeAny, {
-        amount: bigint;
-        pricePerUnit: bigint;
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }>;
+        l1DataGas: z.ZodObject<{
+            gasConsumed: z.ZodBigInt;
+            gasPrice: z.ZodBigInt;
+        }, "strip", z.ZodTypeAny, {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }, {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        }>;
+    }, "type">, "strip", z.ZodTypeAny, {
         feeTokenAddress: `0x${string}`;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     }, {
-        amount: bigint;
-        pricePerUnit: bigint;
         feeTokenAddress: string;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     }>>;
 }, "strip", z.ZodTypeAny, {
     type: "native";
     transactions: {
-        amount: bigint;
-        pricePerUnit: bigint;
         feeTokenAddress: `0x${string}`;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     };
     deployment?: {
-        amount: bigint;
-        pricePerUnit: bigint;
         feeTokenAddress: `0x${string}`;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     } | undefined;
 }, {
     type: "native";
     transactions: {
-        amount: bigint;
-        pricePerUnit: bigint;
         feeTokenAddress: string;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     };
     deployment?: {
-        amount: bigint;
-        pricePerUnit: bigint;
         feeTokenAddress: string;
-        max?: {
-            amount: bigint;
-            pricePerUnit: bigint;
-        } | {
-            maxFee: bigint;
-        } | undefined;
-        dataGasConsumed?: bigint | undefined;
-        dataGasPrice?: bigint | undefined;
+        l1Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l2Gas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
+        l1DataGas: {
+            gasConsumed: bigint;
+            gasPrice: bigint;
+        };
     } | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"paymaster">;
@@ -705,12 +615,12 @@ export declare const estimatedFeesV2Schema: z.ZodDiscriminatedUnion<"type", [z.Z
         maxFee: z.ZodBigInt;
         overallFee: z.ZodBigInt;
     }, "type">, "strip", z.ZodTypeAny, {
-        maxFee: bigint;
         feeTokenAddress: `0x${string}`;
+        maxFee: bigint;
         overallFee: bigint;
     }, {
-        maxFee: bigint;
         feeTokenAddress: string;
+        maxFee: bigint;
         overallFee: bigint;
     }>;
     deployment: z.ZodOptional<z.ZodObject<Omit<{
@@ -719,41 +629,41 @@ export declare const estimatedFeesV2Schema: z.ZodDiscriminatedUnion<"type", [z.Z
         maxFee: z.ZodBigInt;
         overallFee: z.ZodBigInt;
     }, "type">, "strip", z.ZodTypeAny, {
-        maxFee: bigint;
         feeTokenAddress: `0x${string}`;
+        maxFee: bigint;
         overallFee: bigint;
     }, {
-        maxFee: bigint;
         feeTokenAddress: string;
+        maxFee: bigint;
         overallFee: bigint;
     }>>;
 }, "strip", z.ZodTypeAny, {
     type: "paymaster";
     transactions: {
-        maxFee: bigint;
         feeTokenAddress: `0x${string}`;
+        maxFee: bigint;
         overallFee: bigint;
     };
     deployment?: {
-        maxFee: bigint;
         feeTokenAddress: `0x${string}`;
+        maxFee: bigint;
         overallFee: bigint;
     } | undefined;
 }, {
     type: "paymaster";
     transactions: {
-        maxFee: bigint;
         feeTokenAddress: string;
+        maxFee: bigint;
         overallFee: bigint;
     };
     deployment?: {
-        maxFee: bigint;
         feeTokenAddress: string;
+        maxFee: bigint;
         overallFee: bigint;
     } | undefined;
 }>]>;
-export type EstimatedFeesV2 = z.infer<typeof estimatedFeesV2Schema>;
-export type EstimatedFeesV2Enriched = UnionEvaluate<EstimatedFeesV2 & {
+export type EstimatedFees = z.infer<typeof estimatedFeesSchema>;
+export type EstimatedFeesEnriched = UnionEvaluate<EstimatedFees & {
     id: string;
     timestamp: number;
     isSubsidised?: boolean;
@@ -762,156 +672,194 @@ export type NativeEstimatedFee = z.infer<typeof nativeEstimatedFeeSchema>;
 export type PaymasterEstimatedFee = z.infer<typeof paymasterEstimatedFeeSchema>;
 export type NativeEstimatedFees = z.infer<typeof nativeEstimatedFeesSchema>;
 export type PaymasterEstimatedFees = z.infer<typeof paymasterEstimatedFeesSchema>;
-export declare const feeEstimationResultV2Schema: z.ZodObject<{
+export declare const feeEstimationResultSchema: z.ZodObject<{
     native: z.ZodObject<Omit<{
         type: z.ZodLiteral<"native">;
-        transactions: z.ZodObject<{
+        transactions: z.ZodObject<Omit<{
+            type: z.ZodLiteral<"native">;
             feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
-            amount: z.ZodBigInt;
-            pricePerUnit: z.ZodBigInt;
-            max: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-                amount: z.ZodBigInt;
-                pricePerUnit: z.ZodBigInt;
+            l1Gas: z.ZodObject<{
+                gasConsumed: z.ZodBigInt;
+                gasPrice: z.ZodBigInt;
             }, "strip", z.ZodTypeAny, {
-                amount: bigint;
-                pricePerUnit: bigint;
+                gasConsumed: bigint;
+                gasPrice: bigint;
             }, {
-                amount: bigint;
-                pricePerUnit: bigint;
-            }>, z.ZodObject<{
-                maxFee: z.ZodBigInt;
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            }>;
+            l2Gas: z.ZodObject<{
+                gasConsumed: z.ZodBigInt;
+                gasPrice: z.ZodBigInt;
             }, "strip", z.ZodTypeAny, {
-                maxFee: bigint;
+                gasConsumed: bigint;
+                gasPrice: bigint;
             }, {
-                maxFee: bigint;
-            }>]>>;
-            dataGasConsumed: z.ZodOptional<z.ZodBigInt>;
-            dataGasPrice: z.ZodOptional<z.ZodBigInt>;
-        }, "strip", z.ZodTypeAny, {
-            amount: bigint;
-            pricePerUnit: bigint;
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            }>;
+            l1DataGas: z.ZodObject<{
+                gasConsumed: z.ZodBigInt;
+                gasPrice: z.ZodBigInt;
+            }, "strip", z.ZodTypeAny, {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            }, {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            }>;
+        }, "type">, "strip", z.ZodTypeAny, {
             feeTokenAddress: `0x${string}`;
-            max?: {
-                amount: bigint;
-                pricePerUnit: bigint;
-            } | {
-                maxFee: bigint;
-            } | undefined;
-            dataGasConsumed?: bigint | undefined;
-            dataGasPrice?: bigint | undefined;
+            l1Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l2Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l1DataGas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
         }, {
-            amount: bigint;
-            pricePerUnit: bigint;
             feeTokenAddress: string;
-            max?: {
-                amount: bigint;
-                pricePerUnit: bigint;
-            } | {
-                maxFee: bigint;
-            } | undefined;
-            dataGasConsumed?: bigint | undefined;
-            dataGasPrice?: bigint | undefined;
+            l1Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l2Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l1DataGas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
         }>;
-        deployment: z.ZodOptional<z.ZodObject<{
+        deployment: z.ZodOptional<z.ZodObject<Omit<{
+            type: z.ZodLiteral<"native">;
             feeTokenAddress: z.ZodEffects<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string, string>>, `0x${string}`, string>;
-            amount: z.ZodBigInt;
-            pricePerUnit: z.ZodBigInt;
-            max: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-                amount: z.ZodBigInt;
-                pricePerUnit: z.ZodBigInt;
+            l1Gas: z.ZodObject<{
+                gasConsumed: z.ZodBigInt;
+                gasPrice: z.ZodBigInt;
             }, "strip", z.ZodTypeAny, {
-                amount: bigint;
-                pricePerUnit: bigint;
+                gasConsumed: bigint;
+                gasPrice: bigint;
             }, {
-                amount: bigint;
-                pricePerUnit: bigint;
-            }>, z.ZodObject<{
-                maxFee: z.ZodBigInt;
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            }>;
+            l2Gas: z.ZodObject<{
+                gasConsumed: z.ZodBigInt;
+                gasPrice: z.ZodBigInt;
             }, "strip", z.ZodTypeAny, {
-                maxFee: bigint;
+                gasConsumed: bigint;
+                gasPrice: bigint;
             }, {
-                maxFee: bigint;
-            }>]>>;
-            dataGasConsumed: z.ZodOptional<z.ZodBigInt>;
-            dataGasPrice: z.ZodOptional<z.ZodBigInt>;
-        }, "strip", z.ZodTypeAny, {
-            amount: bigint;
-            pricePerUnit: bigint;
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            }>;
+            l1DataGas: z.ZodObject<{
+                gasConsumed: z.ZodBigInt;
+                gasPrice: z.ZodBigInt;
+            }, "strip", z.ZodTypeAny, {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            }, {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            }>;
+        }, "type">, "strip", z.ZodTypeAny, {
             feeTokenAddress: `0x${string}`;
-            max?: {
-                amount: bigint;
-                pricePerUnit: bigint;
-            } | {
-                maxFee: bigint;
-            } | undefined;
-            dataGasConsumed?: bigint | undefined;
-            dataGasPrice?: bigint | undefined;
+            l1Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l2Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l1DataGas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
         }, {
-            amount: bigint;
-            pricePerUnit: bigint;
             feeTokenAddress: string;
-            max?: {
-                amount: bigint;
-                pricePerUnit: bigint;
-            } | {
-                maxFee: bigint;
-            } | undefined;
-            dataGasConsumed?: bigint | undefined;
-            dataGasPrice?: bigint | undefined;
+            l1Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l2Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l1DataGas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
         }>>;
     }, "type">, "strip", z.ZodTypeAny, {
         transactions: {
-            amount: bigint;
-            pricePerUnit: bigint;
             feeTokenAddress: `0x${string}`;
-            max?: {
-                amount: bigint;
-                pricePerUnit: bigint;
-            } | {
-                maxFee: bigint;
-            } | undefined;
-            dataGasConsumed?: bigint | undefined;
-            dataGasPrice?: bigint | undefined;
+            l1Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l2Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l1DataGas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
         };
         deployment?: {
-            amount: bigint;
-            pricePerUnit: bigint;
             feeTokenAddress: `0x${string}`;
-            max?: {
-                amount: bigint;
-                pricePerUnit: bigint;
-            } | {
-                maxFee: bigint;
-            } | undefined;
-            dataGasConsumed?: bigint | undefined;
-            dataGasPrice?: bigint | undefined;
+            l1Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l2Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l1DataGas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
         } | undefined;
     }, {
         transactions: {
-            amount: bigint;
-            pricePerUnit: bigint;
             feeTokenAddress: string;
-            max?: {
-                amount: bigint;
-                pricePerUnit: bigint;
-            } | {
-                maxFee: bigint;
-            } | undefined;
-            dataGasConsumed?: bigint | undefined;
-            dataGasPrice?: bigint | undefined;
+            l1Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l2Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l1DataGas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
         };
         deployment?: {
-            amount: bigint;
-            pricePerUnit: bigint;
             feeTokenAddress: string;
-            max?: {
-                amount: bigint;
-                pricePerUnit: bigint;
-            } | {
-                maxFee: bigint;
-            } | undefined;
-            dataGasConsumed?: bigint | undefined;
-            dataGasPrice?: bigint | undefined;
+            l1Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l2Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l1DataGas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
         } | undefined;
     }>;
     paymaster: z.ZodOptional<z.ZodObject<Omit<{
@@ -922,12 +870,12 @@ export declare const feeEstimationResultV2Schema: z.ZodObject<{
             maxFee: z.ZodBigInt;
             overallFee: z.ZodBigInt;
         }, "type">, "strip", z.ZodTypeAny, {
-            maxFee: bigint;
             feeTokenAddress: `0x${string}`;
+            maxFee: bigint;
             overallFee: bigint;
         }, {
-            maxFee: bigint;
             feeTokenAddress: string;
+            maxFee: bigint;
             overallFee: bigint;
         }>;
         deployment: z.ZodOptional<z.ZodObject<Omit<{
@@ -936,118 +884,130 @@ export declare const feeEstimationResultV2Schema: z.ZodObject<{
             maxFee: z.ZodBigInt;
             overallFee: z.ZodBigInt;
         }, "type">, "strip", z.ZodTypeAny, {
-            maxFee: bigint;
             feeTokenAddress: `0x${string}`;
+            maxFee: bigint;
             overallFee: bigint;
         }, {
-            maxFee: bigint;
             feeTokenAddress: string;
+            maxFee: bigint;
             overallFee: bigint;
         }>>;
     }, "type">, "strip", z.ZodTypeAny, {
         transactions: {
-            maxFee: bigint;
             feeTokenAddress: `0x${string}`;
+            maxFee: bigint;
             overallFee: bigint;
         };
         deployment?: {
-            maxFee: bigint;
             feeTokenAddress: `0x${string}`;
+            maxFee: bigint;
             overallFee: bigint;
         } | undefined;
     }, {
         transactions: {
-            maxFee: bigint;
             feeTokenAddress: string;
+            maxFee: bigint;
             overallFee: bigint;
         };
         deployment?: {
-            maxFee: bigint;
             feeTokenAddress: string;
+            maxFee: bigint;
             overallFee: bigint;
         } | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     native: {
         transactions: {
-            amount: bigint;
-            pricePerUnit: bigint;
             feeTokenAddress: `0x${string}`;
-            max?: {
-                amount: bigint;
-                pricePerUnit: bigint;
-            } | {
-                maxFee: bigint;
-            } | undefined;
-            dataGasConsumed?: bigint | undefined;
-            dataGasPrice?: bigint | undefined;
+            l1Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l2Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l1DataGas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
         };
         deployment?: {
-            amount: bigint;
-            pricePerUnit: bigint;
             feeTokenAddress: `0x${string}`;
-            max?: {
-                amount: bigint;
-                pricePerUnit: bigint;
-            } | {
-                maxFee: bigint;
-            } | undefined;
-            dataGasConsumed?: bigint | undefined;
-            dataGasPrice?: bigint | undefined;
+            l1Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l2Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l1DataGas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
         } | undefined;
     };
     paymaster?: {
         transactions: {
-            maxFee: bigint;
             feeTokenAddress: `0x${string}`;
+            maxFee: bigint;
             overallFee: bigint;
         };
         deployment?: {
-            maxFee: bigint;
             feeTokenAddress: `0x${string}`;
+            maxFee: bigint;
             overallFee: bigint;
         } | undefined;
     } | undefined;
 }, {
     native: {
         transactions: {
-            amount: bigint;
-            pricePerUnit: bigint;
             feeTokenAddress: string;
-            max?: {
-                amount: bigint;
-                pricePerUnit: bigint;
-            } | {
-                maxFee: bigint;
-            } | undefined;
-            dataGasConsumed?: bigint | undefined;
-            dataGasPrice?: bigint | undefined;
+            l1Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l2Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l1DataGas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
         };
         deployment?: {
-            amount: bigint;
-            pricePerUnit: bigint;
             feeTokenAddress: string;
-            max?: {
-                amount: bigint;
-                pricePerUnit: bigint;
-            } | {
-                maxFee: bigint;
-            } | undefined;
-            dataGasConsumed?: bigint | undefined;
-            dataGasPrice?: bigint | undefined;
+            l1Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l2Gas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
+            l1DataGas: {
+                gasConsumed: bigint;
+                gasPrice: bigint;
+            };
         } | undefined;
     };
     paymaster?: {
         transactions: {
-            maxFee: bigint;
             feeTokenAddress: string;
+            maxFee: bigint;
             overallFee: bigint;
         };
         deployment?: {
-            maxFee: bigint;
             feeTokenAddress: string;
+            maxFee: bigint;
             overallFee: bigint;
         } | undefined;
     } | undefined;
 }>;
-export type FeeEstimationResultV2 = z.infer<typeof feeEstimationResultV2Schema>;
+export type FeeEstimationResult = z.infer<typeof feeEstimationResultSchema>;
+export type NativeEstimatedFeeData = StrictOmit<NativeEstimatedFee, "type">;
+export type NativeEstimatedFeesData = StrictOmit<NativeEstimatedFees, "type">;
+export type PaymasterEstimatedFeeData = StrictOmit<PaymasterEstimatedFee, "type">;
+export type PaymasterEstimatedFeesData = StrictOmit<PaymasterEstimatedFees, "type">;