connection moduleType migration: roles -> roles_v1

gnosisguild · Feb 12, 2024 · 9d6ec5b · 9d6ec5b
1 parent c193044
commit 9d6ec5b
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 19 deletions.
diff --git a/extension/src/connections/connectionHooks.tsx b/extension/src/connections/connectionHooks.tsx
@@ -238,6 +238,17 @@ const CONNECTION_STATE_MIGRATIONS: ConnectionStateMigration[] = [
       pilotAddress: connection.pilotAddress.toLowerCase(),
     }
   },
+
+  function renameRolesV1ModuleType(connection) {
+    // moduleType: 'roles' -> 'roles_v1' rename
+    return {
+      ...connection,
+      moduleType:
+        connection.moduleType === ('roles' as unknown)
+          ? KnownContracts.ROLES_V1
+          : connection.moduleType,
+    }
+  },
 ]
 
 // Apply all migrations to the given connections

diff --git a/extension/src/providers/WrappingProvider.ts b/extension/src/providers/WrappingProvider.ts
@@ -7,8 +7,10 @@ import { MetaTransaction } from 'react-multisend'
 import { initSafeApiKit, sendTransaction } from '../safe'
 import { Connection, Eip1193Provider, TransactionData } from '../types'
 
-const RolesInterface =
+const RolesV1Interface =
   ContractFactories[KnownContracts.ROLES_V1].createInterface()
+const RolesV2Interface =
+  ContractFactories[KnownContracts.ROLES_V2].createInterface()
 const DelayInterface = ContractFactories[KnownContracts.DELAY].createInterface()
 
 export function wrapRequest(
@@ -20,24 +22,30 @@ export function wrapRequest(
   }
 
   let data: string
-  if (connection.moduleType === KnownContracts.ROLES_V1) {
-    data = RolesInterface.encodeFunctionData('execTransactionWithRole', [
-      request.to || '',
-      request.value || 0,
-      request.data || '0x00',
-      ('operation' in request && request.operation) || 0,
-      connection.roleId || 0,
-      true,
-    ])
-  } else if (connection.moduleType === KnownContracts.DELAY) {
-    data = DelayInterface.encodeFunctionData('execTransactionFromModule', [
-      request.to || '',
-      request.value || 0,
-      request.data || '0x00',
-      ('operation' in request && request.operation) || 0,
-    ])
-  } else {
-    throw new Error(`Unsupported module type: ${connection.moduleType}`)
+  switch (connection.moduleType) {
+    case KnownContracts.ROLES_V1:
+      data = RolesV1Interface.encodeFunctionData('execTransactionWithRole', [
+        request.to || '',
+        request.value || 0,
+        request.data || '0x00',
+        ('operation' in request && request.operation) || 0,
+        connection.roleId || 0,
+        true,
+      ])
+      break
+    case KnownContracts.ROLES_V2:
+      // TODO
+      break
+    case KnownContracts.DELAY:
+      data = DelayInterface.encodeFunctionData('execTransactionFromModule', [
+        request.to || '',
+        request.value || 0,
+        request.data || '0x00',
+        ('operation' in request && request.operation) || 0,
+      ])
+      break
+    default:
+      throw new Error(`Unsupported module type: ${connection.moduleType}`)
   }
 
   return {