Merge pull request rhinestonewtf#80 from rhinestonewtf/feat/encode-va…

…lidator-nonce feat: add encode validator nonce helper
madjid80 · Oct 9, 2024 · fa8c219 · fa8c219
2 parents 2f21dfd + a6fd96a
commit fa8c219
Show file tree

Hide file tree

Showing 13 changed files with 99 additions and 0 deletions.
diff --git a/src/account/api/encodeValidatorNonce.ts b/src/account/api/encodeValidatorNonce.ts
@@ -0,0 +1,17 @@
+import { Hex, PublicClient } from 'viem'
+import { Account } from '../types'
+import { getAccountImplementation } from './getAccountImplementation'
+import { Module } from '../../module/types'
+
+export const encodeValidatorNonce = ({
+  account,
+  validator,
+}: {
+  account: Account
+  validator: Module
+}): bigint => {
+  const accountImplementation = getAccountImplementation({ account })
+  return accountImplementation.encodeValidatorNonce({
+    validator,
+  })
+}
diff --git a/src/account/api/index.ts b/src/account/api/index.ts
@@ -8,3 +8,4 @@ export * from './encode1271Signature'
 export * from './encode1271Hash'
 export * from './encodeModuleInstallationData'
 export * from './encodeModuleUninstallationData'
+export * from './encodeValidatorNonce'
diff --git a/src/account/erc7579-implementation/api/encodeValidatorNonce.ts b/src/account/erc7579-implementation/api/encodeValidatorNonce.ts
@@ -0,0 +1,11 @@
+import { pad } from 'viem'
+import { Module } from '../../../module/types'
+
+export const encodeValidatorNonce = ({ validator }: { validator: Module }) => {
+  return BigInt(
+    pad(validator.address, {
+      dir: 'right',
+      size: 24,
+    }),
+  )
+}
diff --git a/src/account/erc7579-implementation/index.ts b/src/account/erc7579-implementation/index.ts
@@ -14,6 +14,7 @@ import { encode1271Signature } from './api/encode1271Signature'
 import { encode1271Hash } from './api/encode1271Hash'
 import { encodeModuleInstallationData } from './api/encodeModuleInstallationData'
 import { encodeModuleUninstallationData } from './api/encodeModuleUninstallationData'
+import { encodeValidatorNonce } from './api/encodeValidatorNonce'
 
 export class ERC7579Implementation {
   getInstalledModules = async ({
@@ -101,4 +102,8 @@ export class ERC7579Implementation {
   }): Promise<Hex> => {
     return await encodeModuleUninstallationData({ client, account, module })
   }
+
+  encodeValidatorNonce = ({ validator }: { validator: Module }): bigint => {
+    return encodeValidatorNonce({ validator })
+  }
 }
diff --git a/src/account/index.ts b/src/account/index.ts
@@ -8,6 +8,7 @@ export {
   encode1271Hash,
   encodeModuleInstallationData,
   encodeModuleUninstallationData,
+  encodeValidatorNonce,
 } from './api'
 
 export type { Account, AccountType, Execution, InitialModules } from './types'
diff --git a/src/account/kernel/api/encodeValidatorNonce.ts b/src/account/kernel/api/encodeValidatorNonce.ts
@@ -0,0 +1,21 @@
+import { pad, encodePacked } from 'viem'
+import { KernelModule } from '../types'
+
+export const encodeValidatorNonce = ({
+  validator,
+}: {
+  validator: KernelModule
+}) => {
+  return BigInt(
+    pad(
+      encodePacked(
+        ['bytes1', 'bytes1', 'address'],
+        ['0x00', '0x00', validator.address],
+      ),
+      {
+        dir: 'right',
+        size: 24,
+      },
+    ),
+  )
+}
diff --git a/src/account/kernel/index.ts b/src/account/kernel/index.ts
@@ -14,6 +14,7 @@ import { encode1271Signature } from './api/encode1271Signature'
 import { encode1271Hash } from './api/encode1271Hash'
 import { encodeModuleInstallationData } from './api/encodeModuleInstallationData'
 import { encodeModuleUninstallationData } from './api/encodeModuleUninstallationData'
+import { encodeValidatorNonce } from './api/encodeValidatorNonce'
 
 export class KernelImplementation {
   getInstalledModules = async ({
@@ -101,4 +102,12 @@ export class KernelImplementation {
   }): Promise<Hex> => {
     return await encodeModuleUninstallationData({ client, account, module })
   }
+
+  encodeValidatorNonce = ({
+    validator,
+  }: {
+    validator: KernelModule
+  }): bigint => {
+    return encodeValidatorNonce({ validator })
+  }
 }
diff --git a/src/account/kernel/types.ts b/src/account/kernel/types.ts
@@ -2,6 +2,7 @@ import { CallType } from '../../module/types'
 import { Address, Hex } from 'viem'
 
 export type KernelModule = {
+  address: Address
   module: Address
   initData: Hex
   deInitData: Hex

diff --git a/src/account/nexus/api/encodeValidatorNonce.ts b/src/account/nexus/api/encodeValidatorNonce.ts
@@ -0,0 +1,11 @@
+import { pad } from 'viem'
+import { Module } from '../../../module/types'
+
+export const encodeValidatorNonce = ({ validator }: { validator: Module }) => {
+  return BigInt(
+    pad(validator.address, {
+      dir: 'right',
+      size: 24,
+    }),
+  )
+}
diff --git a/src/account/nexus/index.ts b/src/account/nexus/index.ts
@@ -14,6 +14,7 @@ import { encode1271Signature } from './api/encode1271Signature'
 import { encode1271Hash } from './api/encode1271Hash'
 import { encodeModuleInstallationData } from './api/encodeModuleInstallationData'
 import { encodeModuleUninstallationData } from './api/encodeModuleUninstallationData'
+import { encodeValidatorNonce } from './api/encodeValidatorNonce'
 
 export class NexusImplementation {
   getInstalledModules = async ({
@@ -101,4 +102,8 @@ export class NexusImplementation {
   }): Promise<Hex> => {
     return await encodeModuleUninstallationData({ client, account, module })
   }
+
+  encodeValidatorNonce = ({ validator }: { validator: Module }): bigint => {
+    return encodeValidatorNonce({ validator })
+  }
 }
diff --git a/src/account/safe/api/encodeValidatorNonce.ts b/src/account/safe/api/encodeValidatorNonce.ts
@@ -0,0 +1,11 @@
+import { pad } from 'viem'
+import { Module } from '../../../module/types'
+
+export const encodeValidatorNonce = ({ validator }: { validator: Module }) => {
+  return BigInt(
+    pad(validator.address, {
+      dir: 'right',
+      size: 24,
+    }),
+  )
+}
diff --git a/src/account/safe/index.ts b/src/account/safe/index.ts
@@ -14,6 +14,7 @@ import { encode1271Signature } from './api/encode1271Signature'
 import { encode1271Hash } from './api/encode1271Hash'
 import { encodeModuleInstallationData } from './api/encodeModuleInstallationData'
 import { encodeModuleUninstallationData } from './api/encodeModuleUninstallationData'
+import { encodeValidatorNonce } from './api/encodeValidatorNonce'
 
 export class SafeImplementation {
   getInstalledModules = async ({
@@ -101,4 +102,8 @@ export class SafeImplementation {
   }): Promise<Hex> => {
     return await encodeModuleUninstallationData({ client, account, module })
   }
+
+  encodeValidatorNonce = ({ validator }: { validator: Module }): bigint => {
+    return encodeValidatorNonce({ validator })
+  }
 }
diff --git a/src/index.ts b/src/index.ts
@@ -9,6 +9,7 @@ export {
   encode1271Hash,
   encodeModuleInstallationData,
   encodeModuleUninstallationData,
+  encodeValidatorNonce,
 } from './account'
 export type { Account, AccountType, Execution, InitialModules } from './account'