Merge pull request #52 from rhinestonewtf/split-encode-sig

split-encode-sig
rhinestonewtf · Sep 10, 2024 · ae5e667 · ae5e667
2 parents 2fd2b1c + 16799eb
commit ae5e667
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 4 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -27,6 +27,7 @@ export {
   getOwnableValidatorOwners,
   getOwnableValidatorThreshold,
   getOwnableValidatorMockSignature,
+  encodeValidationData,
   SCHEDULED_ORDERS_EXECUTER_ADDRESS,
   getScheduledOrdersExecutor,
   getCreateScheduledOrderAction,
@@ -88,6 +89,7 @@ export {
   getFlashloanWhitelist,
   fetchRegistryModules,
   REGISTRY_ADDRESS,
+  MOCK_ATTESTER_ADDRESS,
   SMART_SESSIONS_ADDRESS,
   getSmartSessionsValidator,
   getEnableSessionsAction,
@@ -106,7 +108,19 @@ export {
   getSudoPolicy,
   getUniversalActionPolicy,
   encodeSmartSessionSignature,
+  encodeUseOrEnableSmartSessionSignature,
+  isSessionEnabled,
+  hashChainSessions,
   SmartSessionMode,
+  Session,
+  SessionEIP712,
+  PolicyData,
+  ERC7739Data,
+  ActionData,
+  EnableSession,
+  EnableSessionData,
+  ChainDigest,
+  ChainSession,
   CallType,
 } from './module'
 

diff --git a/src/module/index.ts b/src/module/index.ts
@@ -19,6 +19,7 @@ export {
   getOwnableValidatorOwners,
   getOwnableValidatorThreshold,
   getOwnableValidatorMockSignature,
+  encodeValidationData,
 } from './ownable-validator'
 
 export {
@@ -130,10 +131,26 @@ export {
   getSudoPolicy,
   getUniversalActionPolicy,
   encodeSmartSessionSignature,
+  encodeUseOrEnableSmartSessionSignature,
+  isSessionEnabled,
+  hashChainSessions,
   SmartSessionMode,
+  Session,
+  SessionEIP712,
+  PolicyData,
+  ERC7739Data,
+  ActionData,
+  EnableSession,
+  EnableSessionData,
+  ChainDigest,
+  ChainSession,
 } from './smart-sessions'
 
-export { fetchRegistryModules, REGISTRY_ADDRESS } from './registry'
+export {
+  fetchRegistryModules,
+  REGISTRY_ADDRESS,
+  MOCK_ATTESTER_ADDRESS,
+} from './registry'
 
 export type {
   ModuleType,

diff --git a/src/module/ownable-validator/index.ts b/src/module/ownable-validator/index.ts
@@ -7,4 +7,5 @@ export {
   getOwnableValidatorOwners,
   getOwnableValidatorMockSignature,
   getOwnableValidatorThreshold,
+  encodeValidationData,
 } from './usage'
diff --git a/src/module/registry/index.ts b/src/module/registry/index.ts
@@ -1,2 +1,2 @@
 export { fetchRegistryModules } from './usage'
-export { REGISTRY_ADDRESS } from './constants'
+export { REGISTRY_ADDRESS, MOCK_ATTESTER_ADDRESS } from './constants'
diff --git a/src/module/smart-sessions/index.ts b/src/module/smart-sessions/index.ts
@@ -2,4 +2,4 @@ export * from './installation'
 export * from './usage'
 export * from './constants'
 export * from './policies'
-export { SmartSessionMode } from './types'
+export * from './types'
diff --git a/src/module/smart-sessions/usage.ts b/src/module/smart-sessions/usage.ts
@@ -155,6 +155,55 @@ export const encodeSmartSessionSignature = ({
   }
 }
 
+export const encodeUseOrEnableSmartSessionSignature = async ({
+  account,
+  client,
+  permissionId,
+  signature,
+  enableSessionData,
+}: {
+  account: Account
+  client: PublicClient
+  permissionId: Hex
+  signature: Hex
+  enableSessionData: EnableSessionData
+}) => {
+  const sessionEnabled = await isSessionEnabled({
+    account,
+    client,
+    permissionId,
+  })
+
+  return sessionEnabled
+    ? encodePacked(
+        ['bytes1', 'bytes32', 'bytes'],
+        [
+          SmartSessionMode.USE,
+          permissionId,
+          LibZip.flzCompress(
+            encodeAbiParameters(
+              [
+                {
+                  type: 'bytes',
+                },
+              ],
+              [signature],
+            ),
+          ) as Hex,
+        ],
+      )
+    : encodePacked(
+        ['bytes1', 'bytes32', 'bytes'],
+        [
+          SmartSessionMode.ENABLE,
+          permissionId,
+          LibZip.flzCompress(
+            encodeEnableSessionSignature({ enableSessionData, signature }),
+          ) as Hex,
+        ],
+      )
+}
+
 export const hashChainSessions = (chainSessions: ChainSession[]): Hex => {
   return hashTypedData({
     domain: {
@@ -202,7 +251,7 @@ export const hashChainSessions = (chainSessions: ChainSession[]): Hex => {
   })
 }
 
-export const encodeEnableSessionSignature = ({
+const encodeEnableSessionSignature = ({
   enableSessionData,
   signature,
 }: {