diff --git a/account-kit/smart-contracts/src/ma-v2/abis/maV2Factory.ts b/account-kit/smart-contracts/src/ma-v2/abis/maV2Factory.ts
deleted file mode 100644
index e9fa4e35ff..0000000000
--- a/account-kit/smart-contracts/src/ma-v2/abis/maV2Factory.ts
+++ /dev/null
@@ -1,638 +0,0 @@
-export const MAV2FactoryAbi = [
-  {
-    type: "constructor",
-    inputs: [
-      {
-        name: "_entryPoint",
-        type: "address",
-        internalType: "contract IEntryPoint",
-      },
-      {
-        name: "_accountImpl",
-        type: "address",
-        internalType: "contract ModularAccount",
-      },
-      {
-        name: "_semiModularImpl",
-        type: "address",
-        internalType: "contract SemiModularAccountBytecode",
-      },
-      {
-        name: "_singleSignerValidationModule",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "_webAuthnValidationModule",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "owner",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "ACCOUNT_IMPL",
-    inputs: [],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "contract ModularAccount",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "ENTRY_POINT",
-    inputs: [],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "contract IEntryPoint",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "SEMI_MODULAR_ACCOUNT_IMPL",
-    inputs: [],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "contract SemiModularAccountBytecode",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "SINGLE_SIGNER_VALIDATION_MODULE",
-    inputs: [],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "WEBAUTHN_VALIDATION_MODULE",
-    inputs: [],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "acceptOwnership",
-    inputs: [],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "addStake",
-    inputs: [
-      {
-        name: "unstakeDelay",
-        type: "uint32",
-        internalType: "uint32",
-      },
-    ],
-    outputs: [],
-    stateMutability: "payable",
-  },
-  {
-    type: "function",
-    name: "createAccount",
-    inputs: [
-      {
-        name: "owner",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "salt",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "entityId",
-        type: "uint32",
-        internalType: "uint32",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "contract ModularAccount",
-      },
-    ],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "createSemiModularAccount",
-    inputs: [
-      {
-        name: "owner",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "salt",
-        type: "uint256",
-        internalType: "uint256",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "contract SemiModularAccountBytecode",
-      },
-    ],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "createWebAuthnAccount",
-    inputs: [
-      {
-        name: "ownerX",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "ownerY",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "salt",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "entityId",
-        type: "uint32",
-        internalType: "uint32",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "contract ModularAccount",
-      },
-    ],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "getAddress",
-    inputs: [
-      {
-        name: "owner",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "salt",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "entityId",
-        type: "uint32",
-        internalType: "uint32",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "getAddressSemiModular",
-    inputs: [
-      {
-        name: "owner",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "salt",
-        type: "uint256",
-        internalType: "uint256",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "getAddressWebAuthn",
-    inputs: [
-      {
-        name: "ownerX",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "ownerY",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "salt",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "entityId",
-        type: "uint32",
-        internalType: "uint32",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "getSalt",
-    inputs: [
-      {
-        name: "owner",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "salt",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "entityId",
-        type: "uint32",
-        internalType: "uint32",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "bytes32",
-        internalType: "bytes32",
-      },
-    ],
-    stateMutability: "pure",
-  },
-  {
-    type: "function",
-    name: "getSaltWebAuthn",
-    inputs: [
-      {
-        name: "ownerX",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "ownerY",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "salt",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "entityId",
-        type: "uint32",
-        internalType: "uint32",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "bytes32",
-        internalType: "bytes32",
-      },
-    ],
-    stateMutability: "pure",
-  },
-  {
-    type: "function",
-    name: "owner",
-    inputs: [],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "pendingOwner",
-    inputs: [],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "renounceOwnership",
-    inputs: [],
-    outputs: [],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "transferOwnership",
-    inputs: [
-      {
-        name: "newOwner",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "unlockStake",
-    inputs: [],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "withdraw",
-    inputs: [
-      {
-        name: "to",
-        type: "address",
-        internalType: "address payable",
-      },
-      {
-        name: "token",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "amount",
-        type: "uint256",
-        internalType: "uint256",
-      },
-    ],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "withdrawStake",
-    inputs: [
-      {
-        name: "withdrawAddress",
-        type: "address",
-        internalType: "address payable",
-      },
-    ],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "event",
-    name: "ModularAccountDeployed",
-    inputs: [
-      {
-        name: "account",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "owner",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "salt",
-        type: "uint256",
-        indexed: false,
-        internalType: "uint256",
-      },
-    ],
-    anonymous: false,
-  },
-  {
-    type: "event",
-    name: "OwnershipTransferStarted",
-    inputs: [
-      {
-        name: "previousOwner",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "newOwner",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-    ],
-    anonymous: false,
-  },
-  {
-    type: "event",
-    name: "OwnershipTransferred",
-    inputs: [
-      {
-        name: "previousOwner",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "newOwner",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-    ],
-    anonymous: false,
-  },
-  {
-    type: "event",
-    name: "SemiModularAccountDeployed",
-    inputs: [
-      {
-        name: "account",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "owner",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "salt",
-        type: "uint256",
-        indexed: false,
-        internalType: "uint256",
-      },
-    ],
-    anonymous: false,
-  },
-  {
-    type: "event",
-    name: "WebAuthnModularAccountDeployed",
-    inputs: [
-      {
-        name: "account",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "ownerX",
-        type: "uint256",
-        indexed: true,
-        internalType: "uint256",
-      },
-      {
-        name: "ownerY",
-        type: "uint256",
-        indexed: true,
-        internalType: "uint256",
-      },
-      {
-        name: "salt",
-        type: "uint256",
-        indexed: false,
-        internalType: "uint256",
-      },
-    ],
-    anonymous: false,
-  },
-  {
-    type: "error",
-    name: "AddressEmptyCode",
-    inputs: [
-      {
-        name: "target",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "AddressInsufficientBalance",
-    inputs: [
-      {
-        name: "account",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "FailedInnerCall",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "InvalidAction",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "OwnableInvalidOwner",
-    inputs: [
-      {
-        name: "owner",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "OwnableUnauthorizedAccount",
-    inputs: [
-      {
-        name: "account",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "SafeERC20FailedOperation",
-    inputs: [
-      {
-        name: "token",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "TransferFailed",
-    inputs: [],
-  },
-];
diff --git a/account-kit/smart-contracts/src/ma-v2/abis/smaV2.ts b/account-kit/smart-contracts/src/ma-v2/abis/smaV2.ts
deleted file mode 100644
index d48a15a770..0000000000
--- a/account-kit/smart-contracts/src/ma-v2/abis/smaV2.ts
+++ /dev/null
@@ -1,1288 +0,0 @@
-export const smaV2Abi = [
-  {
-    type: "constructor",
-    inputs: [
-      {
-        name: "entryPoint",
-        type: "address",
-        internalType: "contract IEntryPoint",
-      },
-      {
-        name: "executionInstallDelegate",
-        type: "address",
-        internalType: "contract ExecutionInstallDelegate",
-      },
-    ],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "fallback",
-    stateMutability: "payable",
-  },
-  {
-    type: "receive",
-    stateMutability: "payable",
-  },
-  {
-    type: "function",
-    name: "accountId",
-    inputs: [],
-    outputs: [
-      {
-        name: "",
-        type: "string",
-        internalType: "string",
-      },
-    ],
-    stateMutability: "pure",
-  },
-  {
-    type: "function",
-    name: "entryPoint",
-    inputs: [],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "contract IEntryPoint",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "execute",
-    inputs: [
-      {
-        name: "target",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "value",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "data",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [
-      {
-        name: "result",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    stateMutability: "payable",
-  },
-  {
-    type: "function",
-    name: "executeBatch",
-    inputs: [
-      {
-        name: "calls",
-        type: "tuple[]",
-        internalType: "struct Call[]",
-        components: [
-          {
-            name: "target",
-            type: "address",
-            internalType: "address",
-          },
-          {
-            name: "value",
-            type: "uint256",
-            internalType: "uint256",
-          },
-          {
-            name: "data",
-            type: "bytes",
-            internalType: "bytes",
-          },
-        ],
-      },
-    ],
-    outputs: [
-      {
-        name: "results",
-        type: "bytes[]",
-        internalType: "bytes[]",
-      },
-    ],
-    stateMutability: "payable",
-  },
-  {
-    type: "function",
-    name: "executeUserOp",
-    inputs: [
-      {
-        name: "userOp",
-        type: "tuple",
-        internalType: "struct PackedUserOperation",
-        components: [
-          {
-            name: "sender",
-            type: "address",
-            internalType: "address",
-          },
-          {
-            name: "nonce",
-            type: "uint256",
-            internalType: "uint256",
-          },
-          {
-            name: "initCode",
-            type: "bytes",
-            internalType: "bytes",
-          },
-          {
-            name: "callData",
-            type: "bytes",
-            internalType: "bytes",
-          },
-          {
-            name: "accountGasLimits",
-            type: "bytes32",
-            internalType: "bytes32",
-          },
-          {
-            name: "preVerificationGas",
-            type: "uint256",
-            internalType: "uint256",
-          },
-          {
-            name: "gasFees",
-            type: "bytes32",
-            internalType: "bytes32",
-          },
-          {
-            name: "paymasterAndData",
-            type: "bytes",
-            internalType: "bytes",
-          },
-          {
-            name: "signature",
-            type: "bytes",
-            internalType: "bytes",
-          },
-        ],
-      },
-      {
-        name: "",
-        type: "bytes32",
-        internalType: "bytes32",
-      },
-    ],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "executeWithRuntimeValidation",
-    inputs: [
-      {
-        name: "data",
-        type: "bytes",
-        internalType: "bytes",
-      },
-      {
-        name: "authorization",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    stateMutability: "payable",
-  },
-  {
-    type: "function",
-    name: "getExecutionData",
-    inputs: [
-      {
-        name: "selector",
-        type: "bytes4",
-        internalType: "bytes4",
-      },
-    ],
-    outputs: [
-      {
-        name: "data",
-        type: "tuple",
-        internalType: "struct ExecutionDataView",
-        components: [
-          {
-            name: "module",
-            type: "address",
-            internalType: "address",
-          },
-          {
-            name: "skipRuntimeValidation",
-            type: "bool",
-            internalType: "bool",
-          },
-          {
-            name: "allowGlobalValidation",
-            type: "bool",
-            internalType: "bool",
-          },
-          {
-            name: "executionHooks",
-            type: "bytes25[]",
-            internalType: "HookConfig[]",
-          },
-        ],
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "getFallbackSignerData",
-    inputs: [],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "",
-        type: "bool",
-        internalType: "bool",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "getValidationData",
-    inputs: [
-      {
-        name: "validationFunction",
-        type: "bytes24",
-        internalType: "ModuleEntity",
-      },
-    ],
-    outputs: [
-      {
-        name: "data",
-        type: "tuple",
-        internalType: "struct ValidationDataView",
-        components: [
-          {
-            name: "validationFlags",
-            type: "uint8",
-            internalType: "ValidationFlags",
-          },
-          {
-            name: "validationHooks",
-            type: "bytes25[]",
-            internalType: "HookConfig[]",
-          },
-          {
-            name: "executionHooks",
-            type: "bytes25[]",
-            internalType: "HookConfig[]",
-          },
-          {
-            name: "selectors",
-            type: "bytes4[]",
-            internalType: "bytes4[]",
-          },
-        ],
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "installExecution",
-    inputs: [
-      {
-        name: "module",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "manifest",
-        type: "tuple",
-        internalType: "struct ExecutionManifest",
-        components: [
-          {
-            name: "executionFunctions",
-            type: "tuple[]",
-            internalType: "struct ManifestExecutionFunction[]",
-            components: [
-              {
-                name: "executionSelector",
-                type: "bytes4",
-                internalType: "bytes4",
-              },
-              {
-                name: "skipRuntimeValidation",
-                type: "bool",
-                internalType: "bool",
-              },
-              {
-                name: "allowGlobalValidation",
-                type: "bool",
-                internalType: "bool",
-              },
-            ],
-          },
-          {
-            name: "executionHooks",
-            type: "tuple[]",
-            internalType: "struct ManifestExecutionHook[]",
-            components: [
-              {
-                name: "executionSelector",
-                type: "bytes4",
-                internalType: "bytes4",
-              },
-              {
-                name: "entityId",
-                type: "uint32",
-                internalType: "uint32",
-              },
-              {
-                name: "isPreHook",
-                type: "bool",
-                internalType: "bool",
-              },
-              {
-                name: "isPostHook",
-                type: "bool",
-                internalType: "bool",
-              },
-            ],
-          },
-          {
-            name: "interfaceIds",
-            type: "bytes4[]",
-            internalType: "bytes4[]",
-          },
-        ],
-      },
-      {
-        name: "moduleInstallData",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "installValidation",
-    inputs: [
-      {
-        name: "validationConfig",
-        type: "bytes25",
-        internalType: "ValidationConfig",
-      },
-      {
-        name: "selectors",
-        type: "bytes4[]",
-        internalType: "bytes4[]",
-      },
-      {
-        name: "installData",
-        type: "bytes",
-        internalType: "bytes",
-      },
-      {
-        name: "hooks",
-        type: "bytes[]",
-        internalType: "bytes[]",
-      },
-    ],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "isValidSignature",
-    inputs: [
-      {
-        name: "hash",
-        type: "bytes32",
-        internalType: "bytes32",
-      },
-      {
-        name: "signature",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "bytes4",
-        internalType: "bytes4",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "onERC1155BatchReceived",
-    inputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "",
-        type: "uint256[]",
-        internalType: "uint256[]",
-      },
-      {
-        name: "",
-        type: "uint256[]",
-        internalType: "uint256[]",
-      },
-      {
-        name: "",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "bytes4",
-        internalType: "bytes4",
-      },
-    ],
-    stateMutability: "pure",
-  },
-  {
-    type: "function",
-    name: "onERC1155Received",
-    inputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "bytes4",
-        internalType: "bytes4",
-      },
-    ],
-    stateMutability: "pure",
-  },
-  {
-    type: "function",
-    name: "onERC721Received",
-    inputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "bytes4",
-        internalType: "bytes4",
-      },
-    ],
-    stateMutability: "pure",
-  },
-  {
-    type: "function",
-    name: "performCreate",
-    inputs: [
-      {
-        name: "value",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "initCode",
-        type: "bytes",
-        internalType: "bytes",
-      },
-      {
-        name: "isCreate2",
-        type: "bool",
-        internalType: "bool",
-      },
-      {
-        name: "salt",
-        type: "bytes32",
-        internalType: "bytes32",
-      },
-    ],
-    outputs: [
-      {
-        name: "createdAddr",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    stateMutability: "payable",
-  },
-  {
-    type: "function",
-    name: "proxiableUUID",
-    inputs: [],
-    outputs: [
-      {
-        name: "",
-        type: "bytes32",
-        internalType: "bytes32",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "supportsInterface",
-    inputs: [
-      {
-        name: "interfaceId",
-        type: "bytes4",
-        internalType: "bytes4",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "bool",
-        internalType: "bool",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "uninstallExecution",
-    inputs: [
-      {
-        name: "module",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "manifest",
-        type: "tuple",
-        internalType: "struct ExecutionManifest",
-        components: [
-          {
-            name: "executionFunctions",
-            type: "tuple[]",
-            internalType: "struct ManifestExecutionFunction[]",
-            components: [
-              {
-                name: "executionSelector",
-                type: "bytes4",
-                internalType: "bytes4",
-              },
-              {
-                name: "skipRuntimeValidation",
-                type: "bool",
-                internalType: "bool",
-              },
-              {
-                name: "allowGlobalValidation",
-                type: "bool",
-                internalType: "bool",
-              },
-            ],
-          },
-          {
-            name: "executionHooks",
-            type: "tuple[]",
-            internalType: "struct ManifestExecutionHook[]",
-            components: [
-              {
-                name: "executionSelector",
-                type: "bytes4",
-                internalType: "bytes4",
-              },
-              {
-                name: "entityId",
-                type: "uint32",
-                internalType: "uint32",
-              },
-              {
-                name: "isPreHook",
-                type: "bool",
-                internalType: "bool",
-              },
-              {
-                name: "isPostHook",
-                type: "bool",
-                internalType: "bool",
-              },
-            ],
-          },
-          {
-            name: "interfaceIds",
-            type: "bytes4[]",
-            internalType: "bytes4[]",
-          },
-        ],
-      },
-      {
-        name: "moduleUninstallData",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "uninstallValidation",
-    inputs: [
-      {
-        name: "validationFunction",
-        type: "bytes24",
-        internalType: "ModuleEntity",
-      },
-      {
-        name: "uninstallData",
-        type: "bytes",
-        internalType: "bytes",
-      },
-      {
-        name: "hookUninstallData",
-        type: "bytes[]",
-        internalType: "bytes[]",
-      },
-    ],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "updateFallbackSignerData",
-    inputs: [
-      {
-        name: "fallbackSigner",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "isDisabled",
-        type: "bool",
-        internalType: "bool",
-      },
-    ],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "upgradeToAndCall",
-    inputs: [
-      {
-        name: "newImplementation",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "data",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [],
-    stateMutability: "payable",
-  },
-  {
-    type: "function",
-    name: "validateUserOp",
-    inputs: [
-      {
-        name: "userOp",
-        type: "tuple",
-        internalType: "struct PackedUserOperation",
-        components: [
-          {
-            name: "sender",
-            type: "address",
-            internalType: "address",
-          },
-          {
-            name: "nonce",
-            type: "uint256",
-            internalType: "uint256",
-          },
-          {
-            name: "initCode",
-            type: "bytes",
-            internalType: "bytes",
-          },
-          {
-            name: "callData",
-            type: "bytes",
-            internalType: "bytes",
-          },
-          {
-            name: "accountGasLimits",
-            type: "bytes32",
-            internalType: "bytes32",
-          },
-          {
-            name: "preVerificationGas",
-            type: "uint256",
-            internalType: "uint256",
-          },
-          {
-            name: "gasFees",
-            type: "bytes32",
-            internalType: "bytes32",
-          },
-          {
-            name: "paymasterAndData",
-            type: "bytes",
-            internalType: "bytes",
-          },
-          {
-            name: "signature",
-            type: "bytes",
-            internalType: "bytes",
-          },
-        ],
-      },
-      {
-        name: "userOpHash",
-        type: "bytes32",
-        internalType: "bytes32",
-      },
-      {
-        name: "missingAccountFunds",
-        type: "uint256",
-        internalType: "uint256",
-      },
-    ],
-    outputs: [
-      {
-        name: "validationData",
-        type: "uint256",
-        internalType: "uint256",
-      },
-    ],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "event",
-    name: "ExecutionInstalled",
-    inputs: [
-      {
-        name: "module",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "manifest",
-        type: "tuple",
-        indexed: false,
-        internalType: "struct ExecutionManifest",
-        components: [
-          {
-            name: "executionFunctions",
-            type: "tuple[]",
-            internalType: "struct ManifestExecutionFunction[]",
-            components: [
-              {
-                name: "executionSelector",
-                type: "bytes4",
-                internalType: "bytes4",
-              },
-              {
-                name: "skipRuntimeValidation",
-                type: "bool",
-                internalType: "bool",
-              },
-              {
-                name: "allowGlobalValidation",
-                type: "bool",
-                internalType: "bool",
-              },
-            ],
-          },
-          {
-            name: "executionHooks",
-            type: "tuple[]",
-            internalType: "struct ManifestExecutionHook[]",
-            components: [
-              {
-                name: "executionSelector",
-                type: "bytes4",
-                internalType: "bytes4",
-              },
-              {
-                name: "entityId",
-                type: "uint32",
-                internalType: "uint32",
-              },
-              {
-                name: "isPreHook",
-                type: "bool",
-                internalType: "bool",
-              },
-              {
-                name: "isPostHook",
-                type: "bool",
-                internalType: "bool",
-              },
-            ],
-          },
-          {
-            name: "interfaceIds",
-            type: "bytes4[]",
-            internalType: "bytes4[]",
-          },
-        ],
-      },
-    ],
-    anonymous: false,
-  },
-  {
-    type: "event",
-    name: "ExecutionUninstalled",
-    inputs: [
-      {
-        name: "module",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "onUninstallSucceeded",
-        type: "bool",
-        indexed: false,
-        internalType: "bool",
-      },
-      {
-        name: "manifest",
-        type: "tuple",
-        indexed: false,
-        internalType: "struct ExecutionManifest",
-        components: [
-          {
-            name: "executionFunctions",
-            type: "tuple[]",
-            internalType: "struct ManifestExecutionFunction[]",
-            components: [
-              {
-                name: "executionSelector",
-                type: "bytes4",
-                internalType: "bytes4",
-              },
-              {
-                name: "skipRuntimeValidation",
-                type: "bool",
-                internalType: "bool",
-              },
-              {
-                name: "allowGlobalValidation",
-                type: "bool",
-                internalType: "bool",
-              },
-            ],
-          },
-          {
-            name: "executionHooks",
-            type: "tuple[]",
-            internalType: "struct ManifestExecutionHook[]",
-            components: [
-              {
-                name: "executionSelector",
-                type: "bytes4",
-                internalType: "bytes4",
-              },
-              {
-                name: "entityId",
-                type: "uint32",
-                internalType: "uint32",
-              },
-              {
-                name: "isPreHook",
-                type: "bool",
-                internalType: "bool",
-              },
-              {
-                name: "isPostHook",
-                type: "bool",
-                internalType: "bool",
-              },
-            ],
-          },
-          {
-            name: "interfaceIds",
-            type: "bytes4[]",
-            internalType: "bytes4[]",
-          },
-        ],
-      },
-    ],
-    anonymous: false,
-  },
-  {
-    type: "event",
-    name: "FallbackSignerUpdated",
-    inputs: [
-      {
-        name: "newFallbackSigner",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "isDisabled",
-        type: "bool",
-        indexed: false,
-        internalType: "bool",
-      },
-    ],
-    anonymous: false,
-  },
-  {
-    type: "event",
-    name: "Initialized",
-    inputs: [
-      {
-        name: "version",
-        type: "uint64",
-        indexed: false,
-        internalType: "uint64",
-      },
-    ],
-    anonymous: false,
-  },
-  {
-    type: "event",
-    name: "Upgraded",
-    inputs: [
-      {
-        name: "implementation",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-    ],
-    anonymous: false,
-  },
-  {
-    type: "event",
-    name: "ValidationInstalled",
-    inputs: [
-      {
-        name: "module",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "entityId",
-        type: "uint32",
-        indexed: true,
-        internalType: "uint32",
-      },
-    ],
-    anonymous: false,
-  },
-  {
-    type: "event",
-    name: "ValidationUninstalled",
-    inputs: [
-      {
-        name: "module",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "entityId",
-        type: "uint32",
-        indexed: true,
-        internalType: "uint32",
-      },
-      {
-        name: "onUninstallSucceeded",
-        type: "bool",
-        indexed: false,
-        internalType: "bool",
-      },
-    ],
-    anonymous: false,
-  },
-  {
-    type: "error",
-    name: "ArrayLengthMismatch",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "CreateFailed",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "DeferredActionSignatureInvalid",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "DeferredValidationHasValidationHooks",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "ExecutionHookAlreadySet",
-    inputs: [
-      {
-        name: "hookConfig",
-        type: "bytes25",
-        internalType: "HookConfig",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "FallbackSignerDisabled",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "FallbackSignerMismatch",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "FallbackValidationInstallationNotAllowed",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "InterfaceNotSupported",
-    inputs: [
-      {
-        name: "module",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "InvalidInitialization",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "InvalidSignatureType",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "ModuleInstallCallbackFailed",
-    inputs: [
-      {
-        name: "module",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "revertReason",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "NonCanonicalEncoding",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "NotEntryPoint",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "PreValidationHookDuplicate",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "RequireUserOperationContext",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "SegmentOutOfOrder",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "SelfCallRecursionDepthExceeded",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "SignatureValidationInvalid",
-    inputs: [
-      {
-        name: "validationFunction",
-        type: "bytes24",
-        internalType: "ModuleEntity",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "UnauthorizedCallContext",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "UnexpectedAggregator",
-    inputs: [
-      {
-        name: "validationFunction",
-        type: "bytes24",
-        internalType: "ModuleEntity",
-      },
-      {
-        name: "aggregator",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "UnrecognizedFunction",
-    inputs: [
-      {
-        name: "selector",
-        type: "bytes4",
-        internalType: "bytes4",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "UpgradeFailed",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "UserOpValidationInvalid",
-    inputs: [
-      {
-        name: "validationFunction",
-        type: "bytes24",
-        internalType: "ModuleEntity",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "ValidationAlreadySet",
-    inputs: [
-      {
-        name: "selector",
-        type: "bytes4",
-        internalType: "bytes4",
-      },
-      {
-        name: "validationFunction",
-        type: "bytes24",
-        internalType: "ModuleEntity",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "ValidationAssocHookLimitExceeded",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "ValidationEntityIdInUse",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "ValidationFunctionMissing",
-    inputs: [
-      {
-        name: "selector",
-        type: "bytes4",
-        internalType: "bytes4",
-      },
-    ],
-  },
-  {
-    type: "error",
-    name: "ValidationSignatureSegmentMissing",
-    inputs: [],
-  },
-];
diff --git a/account-kit/smart-contracts/src/ma-v2/modules/single-signer-validation/abis/singleSignerValidation.ts b/account-kit/smart-contracts/src/ma-v2/modules/single-signer-validation/abis/singleSignerValidation.ts
deleted file mode 100644
index 726f226320..0000000000
--- a/account-kit/smart-contracts/src/ma-v2/modules/single-signer-validation/abis/singleSignerValidation.ts
+++ /dev/null
@@ -1,330 +0,0 @@
-export const singleSignerValidationAbi = [
-  {
-    type: "function",
-    name: "moduleId",
-    inputs: [],
-    outputs: [
-      {
-        name: "",
-        type: "string",
-        internalType: "string",
-      },
-    ],
-    stateMutability: "pure",
-  },
-  {
-    type: "function",
-    name: "onInstall",
-    inputs: [
-      {
-        name: "data",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "onUninstall",
-    inputs: [
-      {
-        name: "data",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "replaySafeHash",
-    inputs: [
-      {
-        name: "account",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "hash",
-        type: "bytes32",
-        internalType: "bytes32",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "bytes32",
-        internalType: "bytes32",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "signers",
-    inputs: [
-      {
-        name: "entityId",
-        type: "uint32",
-        internalType: "uint32",
-      },
-      {
-        name: "account",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "supportsInterface",
-    inputs: [
-      {
-        name: "interfaceId",
-        type: "bytes4",
-        internalType: "bytes4",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "bool",
-        internalType: "bool",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "transferSigner",
-    inputs: [
-      {
-        name: "entityId",
-        type: "uint32",
-        internalType: "uint32",
-      },
-      {
-        name: "newSigner",
-        type: "address",
-        internalType: "address",
-      },
-    ],
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    name: "validateRuntime",
-    inputs: [
-      {
-        name: "account",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "entityId",
-        type: "uint32",
-        internalType: "uint32",
-      },
-      {
-        name: "sender",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "",
-        type: "uint256",
-        internalType: "uint256",
-      },
-      {
-        name: "",
-        type: "bytes",
-        internalType: "bytes",
-      },
-      {
-        name: "",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "validateSignature",
-    inputs: [
-      {
-        name: "account",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "entityId",
-        type: "uint32",
-        internalType: "uint32",
-      },
-      {
-        name: "",
-        type: "address",
-        internalType: "address",
-      },
-      {
-        name: "digest",
-        type: "bytes32",
-        internalType: "bytes32",
-      },
-      {
-        name: "signature",
-        type: "bytes",
-        internalType: "bytes",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "bytes4",
-        internalType: "bytes4",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    name: "validateUserOp",
-    inputs: [
-      {
-        name: "entityId",
-        type: "uint32",
-        internalType: "uint32",
-      },
-      {
-        name: "userOp",
-        type: "tuple",
-        internalType: "struct PackedUserOperation",
-        components: [
-          {
-            name: "sender",
-            type: "address",
-            internalType: "address",
-          },
-          {
-            name: "nonce",
-            type: "uint256",
-            internalType: "uint256",
-          },
-          {
-            name: "initCode",
-            type: "bytes",
-            internalType: "bytes",
-          },
-          {
-            name: "callData",
-            type: "bytes",
-            internalType: "bytes",
-          },
-          {
-            name: "accountGasLimits",
-            type: "bytes32",
-            internalType: "bytes32",
-          },
-          {
-            name: "preVerificationGas",
-            type: "uint256",
-            internalType: "uint256",
-          },
-          {
-            name: "gasFees",
-            type: "bytes32",
-            internalType: "bytes32",
-          },
-          {
-            name: "paymasterAndData",
-            type: "bytes",
-            internalType: "bytes",
-          },
-          {
-            name: "signature",
-            type: "bytes",
-            internalType: "bytes",
-          },
-        ],
-      },
-      {
-        name: "userOpHash",
-        type: "bytes32",
-        internalType: "bytes32",
-      },
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "uint256",
-        internalType: "uint256",
-      },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "event",
-    name: "SignerTransferred",
-    inputs: [
-      {
-        name: "account",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "entityId",
-        type: "uint32",
-        indexed: true,
-        internalType: "uint32",
-      },
-      {
-        name: "newSigner",
-        type: "address",
-        indexed: true,
-        internalType: "address",
-      },
-      {
-        name: "previousSigner",
-        type: "address",
-        indexed: false,
-        internalType: "address",
-      },
-    ],
-    anonymous: true,
-  },
-  {
-    type: "error",
-    name: "InvalidSignatureType",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "NotAuthorized",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "NotImplemented",
-    inputs: [],
-  },
-  {
-    type: "error",
-    name: "UnexpectedDataPassed",
-    inputs: [],
-  },
-];