Merge pull request rhinestonewtf#97 from rhinestonewtf/feat/kernel-hook

feat: make kernel hook optional
KaiCode2 · Oct 30, 2024 · d6cb333 · d6cb333
2 parents 3cb6308 + 3de44ea
commit d6cb333
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/account/kernel/api/encodeModuleInstallationData.ts b/src/account/kernel/api/encodeModuleInstallationData.ts
@@ -1,5 +1,5 @@
 import { Account } from '../../types'
-import { Hex, encodePacked, encodeAbiParameters } from 'viem'
+import { Hex, encodePacked, encodeAbiParameters, zeroAddress } from 'viem'
 import { KernelModule } from '../types'
 
 export const encodeModuleInstallationData = ({
@@ -15,7 +15,7 @@ export const encodeModuleInstallationData = ({
       return encodePacked(
         ['address', 'bytes'],
         [
-          module.hook!,
+          module.hook ?? zeroAddress,
           encodeAbiParameters(
             [{ type: 'bytes' }, { type: 'bytes' }],
             [module.initData, '0x'],
@@ -29,7 +29,7 @@ export const encodeModuleInstallationData = ({
         ['bytes4', 'address', 'bytes'],
         [
           module.selector!,
-          module.hook!,
+          module.hook ?? zeroAddress,
           encodeAbiParameters(
             [{ type: 'bytes' }, { type: 'bytes' }],
             [

diff --git a/src/account/kernel/api/installModule.ts b/src/account/kernel/api/installModule.ts
@@ -5,6 +5,7 @@ import {
   encodeFunctionData,
   encodePacked,
   parseAbi,
+  zeroAddress,
 } from 'viem'
 import { isModuleInstalled } from './isModuleInstalled'
 import { accountAbi } from '../constants/abis'
@@ -48,10 +49,6 @@ const _installModule = async ({
   const executions: Execution[] = []
   const isInstalled = await isModuleInstalled({ client, account, module })
 
-  if (withHook && !module.hook) {
-    throw new Error(`Hook is required for module type ${module.type}`)
-  }
-
   if (!isInstalled) {
     const data = encodeFunctionData({
       functionName: 'installModule',
@@ -63,7 +60,7 @@ const _installModule = async ({
           ? encodePacked(
               ['address', 'bytes'],
               [
-                module.hook!,
+                module.hook ?? zeroAddress,
                 encodeAbiParameters(
                   [{ type: 'bytes' }, { type: 'bytes' }],
                   [module.initData || '0x', '0x'],
@@ -94,7 +91,7 @@ async function installFallback({
   account: Account
   module: KernelModule
 }): Promise<Execution[]> {
-  if (!module.hook || !module.selector || !module.callType) {
+  if (!module.selector || !module.callType) {
     throw new Error(
       `Hook, selector and callType are required for module type ${module.type}`,
     )
@@ -119,7 +116,7 @@ async function installFallback({
           ['bytes4', 'address', 'bytes'],
           [
             module.selector,
-            module.hook,
+            module.hook ?? zeroAddress,
             encodeAbiParameters(
               [{ type: 'bytes' }, { type: 'bytes' }],
               [