fix: parameter defauls for safe module encoding

madjid80 · Oct 9, 2024 · e7631ab · e7631ab
1 parent f089bd2
commit e7631ab
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/account/safe/api/encodeModuleInstallationData.ts b/src/account/safe/api/encodeModuleInstallationData.ts
@@ -1,6 +1,7 @@
 import { Account } from '../../types'
 import { Hex, encodeAbiParameters, parseAbiParameters } from 'viem'
-import { Module } from '../../../module/types'
+import { CallType, Module } from '../../../module/types'
+import { SafeHookType } from '../types'
 
 export const encodeModuleInstallationData = ({
   account,
@@ -18,14 +19,22 @@ export const encodeModuleInstallationData = ({
         parseAbiParameters(
           'uint8 hookType, bytes4 selector, bytes memory initData',
         ),
-        [module.hookType!, module.selector!, module.initData || '0x'],
+        [
+          module.hookType ?? SafeHookType.GLOBAL,
+          module.hookType == SafeHookType.SIG ? module.selector! : '0x00000000',
+          module.initData,
+        ],
       )
     case 'fallback':
       return encodeAbiParameters(
         parseAbiParameters(
           'bytes4 functionSig, bytes1 calltype, bytes memory initData',
         ),
-        [module.functionSig!, module.callType!, module.initData || '0x'],
+        [
+          module.functionSig!,
+          module.callType ?? CallType.CALLTYPE_SINGLE,
+          module.initData,
+        ],
       )
     default:
       throw new Error(`Unknown module type ${module.type}`)

diff --git a/src/account/safe/api/encodeModuleUninstallationData.ts b/src/account/safe/api/encodeModuleUninstallationData.ts
@@ -7,6 +7,7 @@ import {
 } from 'viem'
 import { Module } from '../../../module/types'
 import { getPreviousModule } from '../../../common'
+import { SafeHookType } from '../types'
 
 export const encodeModuleUninstallationData = async ({
   client,
@@ -33,7 +34,11 @@ export const encodeModuleUninstallationData = async ({
         parseAbiParameters(
           'uint8 hookType, bytes4 selector, bytes memory deInitData',
         ),
-        [module.hookType!, module.selector!, module.deInitData],
+        [
+          module.hookType ?? SafeHookType.GLOBAL,
+          module.hookType == SafeHookType.SIG ? module.selector! : '0x00000000',
+          module.deInitData,
+        ],
       )
 
     case 'fallback':