chore(deps): update dependency ser-kit to v1 (#321)

* chore(deps): update dependency ser-kit to v1

* update to ser-kit v1

* more adjustments around parsePrefixedAddress

* use PROPOSE_TRANSACTION instead of PROPOSE_SAFE_TRANSACTION

* chore: replace MetaTransactionData type with MetaTransactionRequest

* update ser-kit to v1.0.2

* migrate some tests

* update another place to use metaTransactionRequest

* update ser-kit to v1.0.3

* handle transition from bigint to string

* fix type issue

* remove deprecated dependency

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Philipp Giese <giese.philipp+git@gmail.com>

extension/package.json

@@ -36,7 +36,6 @@
     "@safe-global/api-kit": "^2.4.2",
     "@safe-global/protocol-kit": "^5.0.1",
     "@safe-global/safe-apps-sdk": "^9.1.0",
-    "@safe-global/safe-core-sdk-types": "^5.0.2",
     "@safe-global/safe-gateway-typescript-sdk": "^3.21.10",
     "@shazow/whatsabi": "^0.17.0",
     "@testing-library/dom": "^10.4.0",
@@ -85,7 +84,7 @@
     "react-dom": "^18.2.0",
     "react-select": "5.8.3",
     "rimraf": "6.0.1",
-    "ser-kit": "^0.3.17",
+    "ser-kit": "1.0.3",
     "tailwindcss": "^3.4.14",
     "typescript": "^5.5.4",
     "typescript-eslint": "^7.16.0",

extension/src/chains/getChainId.ts

@@ -1,9 +1,13 @@
 import { invariant } from '@epic-web/invariant'
-import { parsePrefixedAddress, type PrefixedAddress } from 'ser-kit'
+import {
+  splitPrefixedAddress,
+  type ChainId,
+  type PrefixedAddress,
+} from 'ser-kit'
 
-export const getChainId = (address: PrefixedAddress) => {
+export const getChainId = (address: PrefixedAddress): ChainId => {
   // atm, we don't yet support cross-chain routes, so can derive a general chainId from the avatar
-  const [chainId] = parsePrefixedAddress(address)
+  const [chainId] = splitPrefixedAddress(address)
 
   invariant(chainId != null, 'chainId is empty')
 

extension/src/panel/execution-routes/useRouteConnect.ts

@@ -63,7 +63,7 @@ const useCanEstablishConnection = (route: ExecutionRoute) => {
 
   const pilotAddress =
     route.initiator && route.initiator !== `eoa:` + ZeroAddress
-      ? parsePrefixedAddress(route.initiator)[1].toLowerCase()
+      ? parsePrefixedAddress(route.initiator).toLowerCase()
       : undefined
 
   if (pilotAddress == null) {

extension/src/panel/integrations/safe/signing.ts

@@ -1,11 +1,12 @@
-import type { MetaTransactionData } from '@safe-global/safe-core-sdk-types'
+import type { HexAddress } from '@/types'
 import type { EIP712TypedData } from '@safe-global/safe-gateway-typescript-sdk'
 import {
   Contract,
   hashMessage as ethersHashMessage,
   toUtf8String,
   TypedDataEncoder,
 } from 'ethers'
+import type { MetaTransactionRequest } from 'ser-kit'
 
 const SIGN_MESSAGE_LIB_ADDRESS = '0xd53cd0aB83D845Ac265BE939c57F53AD838012c9'
 const SIGN_MESSAGE_LIB_ABI = [
@@ -18,12 +19,12 @@ const signMessageLib = new Contract(
   SIGN_MESSAGE_LIB_ABI,
 )
 
-export const signMessage = (message: string): MetaTransactionData => ({
+export const signMessage = (message: string): MetaTransactionRequest => ({
   to: SIGN_MESSAGE_LIB_ADDRESS,
   data: signMessageLib.interface.encodeFunctionData('signMessage', [
     hashMessage(message),
-  ]),
-  value: '0',
+  ]) as HexAddress,
+  value: 0n,
   operation: 1,
 })
 
@@ -34,13 +35,15 @@ export const typedDataHash = (data: EIP712TypedData): string => {
   return TypedDataEncoder.hash(data.domain as any, types, data.message)
 }
 
-export const signTypedData = (data: EIP712TypedData) => {
+export const signTypedData = (
+  data: EIP712TypedData,
+): MetaTransactionRequest => {
   return {
     to: SIGN_MESSAGE_LIB_ADDRESS,
     data: signMessageLib.interface.encodeFunctionData('signMessage', [
       typedDataHash(data),
-    ]),
-    value: '0',
+    ]) as HexAddress,
+    value: 0n,
     operation: 1,
   }
 }

extension/src/panel/integrations/zodiac/useZodiacModules.ts

@@ -36,7 +36,7 @@ export const useZodiacModules = (
   const [error, setError] = useState(false)
   const [modules, setModules] = useState<Module[]>([])
   const chainId = getChainId(safeAddress)
-  const [, address] = parsePrefixedAddress(safeAddress)
+  const address = parsePrefixedAddress(safeAddress)
 
   useEffect(() => {
     setLoading(true)

extension/src/panel/pages/Root.tsx

@@ -25,12 +25,13 @@ export const Root = () => {
   // make sure the injected provider stays updated on every relevant route change
   const route = useExecutionRoute()
 
-  const chainId = getChainId(route.avatar)
-  const provider = useProvider()
-  const [, avatarAddress] = parsePrefixedAddress(route.avatar)
   const saveRoute = useSaveExecutionRoute()
 
-  useProviderBridge({ provider, chainId, account: avatarAddress })
+  useProviderBridge({
+    provider: useProvider(),
+    chainId: getChainId(route.avatar),
+    account: parsePrefixedAddress(route.avatar),
+  })
   useConnectInjectedWalletIfNeeded(route)
   useDisconnectWalletConnectIfNeeded(route, {
     onDisconnect: () =>

extension/src/panel/pages/legacyConnectionMigrations.ts

@@ -1,18 +1,19 @@
 import {
+  ProviderType,
   type ExecutionRoute,
   type LegacyConnection,
-  ProviderType,
 } from '@/types'
 import { MULTISEND, MULTISEND_CALL_ONLY } from '@/zodiac'
+import { invariant } from '@epic-web/invariant'
 import { KnownContracts } from '@gnosis.pm/zodiac'
 import { ZeroAddress } from 'ethers'
 import {
   AccountType,
   ConnectionType,
-  type Delay,
   formatPrefixedAddress,
   parsePrefixedAddress,
-  type Roles,
+  splitPrefixedAddress,
+  type PrefixedAddress,
   type Waypoint,
 } from 'ser-kit'
 
@@ -46,33 +47,33 @@ export function fromLegacyConnection(
   const delayModuleWaypoint = moduleType === KnownContracts.DELAY && {
     account: {
       type: AccountType.DELAY,
-      prefixedAddress: modulePrefixedAddress,
+      prefixedAddress: modulePrefixedAddress?.toLowerCase(),
       address: connection.moduleAddress,
       chain: chainId,
-    } as Delay,
+    },
 
     connection: {
       type: ConnectionType.IS_ENABLED,
-      from: pilotPrefixedAddress,
+      from: pilotPrefixedAddress.toLowerCase(),
     },
   }
 
   const rolesModuleWaypoint = (moduleType === KnownContracts.ROLES_V1 ||
     moduleType === KnownContracts.ROLES_V2) && {
     account: {
       type: AccountType.ROLES,
-      prefixedAddress: modulePrefixedAddress,
+      prefixedAddress: modulePrefixedAddress?.toLowerCase(),
       address: connection.moduleAddress,
       chain: chainId,
       version: moduleType === KnownContracts.ROLES_V1 ? 1 : 2,
       multisend: [connection.multisend, connection.multisendCallOnly].filter(
         Boolean,
       ) as `0x${string}`[],
-    } as Roles,
+    },
     connection: pilotPrefixedAddress
       ? {
           type: ConnectionType.IS_MEMBER,
-          from: pilotPrefixedAddress,
+          from: pilotPrefixedAddress.toLowerCase(),
           roles: [connection.roleId].filter(Boolean) as string[],
         }
       : undefined,
@@ -85,12 +86,12 @@ export function fromLegacyConnection(
       account: isEoa
         ? ({
             type: AccountType.EOA,
-            prefixedAddress: pilotPrefixedAddress,
+            prefixedAddress: pilotPrefixedAddress.toLowerCase(),
             address: pilotAddress,
           } as const)
         : ({
             type: AccountType.SAFE,
-            prefixedAddress: pilotPrefixedAddress,
+            prefixedAddress: pilotPrefixedAddress.toLowerCase(),
             address: pilotAddress,
             chain: chainId,
             threshold: NaN, // we don't know the threshold
@@ -102,19 +103,19 @@ export function fromLegacyConnection(
     {
       account: {
         type: AccountType.SAFE,
-        prefixedAddress: avatarPrefixedAddress,
+        prefixedAddress: avatarPrefixedAddress.toLowerCase(),
         address: avatarAddress,
         chain: chainId,
         threshold: NaN, // we don't know the threshold
       },
       connection: modulePrefixedAddress
         ? {
             type: ConnectionType.IS_ENABLED,
-            from: modulePrefixedAddress,
+            from: modulePrefixedAddress.toLowerCase(),
           }
         : {
             type: ConnectionType.OWNS,
-            from: pilotPrefixedAddress,
+            from: pilotPrefixedAddress.toLowerCase(),
           },
     } as Waypoint,
   ]
@@ -125,8 +126,10 @@ export function fromLegacyConnection(
     lastUsed: connection.lastUsed,
     providerType,
     waypoints: waypoints as ExecutionRoute['waypoints'],
-    initiator: pilotAddress ? pilotPrefixedAddress : undefined,
-    avatar: avatarPrefixedAddress,
+    initiator: pilotAddress
+      ? (pilotPrefixedAddress.toLowerCase() as PrefixedAddress)
+      : undefined,
+    avatar: avatarPrefixedAddress.toLowerCase() as PrefixedAddress,
   }
 }
 
@@ -135,15 +138,13 @@ export function asLegacyConnection(route: ExecutionRoute): LegacyConnection {
     throw new Error('Not representable as legacy connection')
   }
 
-  const [chainId, avatarAddressChecksummed] = parsePrefixedAddress(route.avatar)
+  const [chainId, avatarAddressChecksummed] = splitPrefixedAddress(route.avatar)
   const avatarAddress = avatarAddressChecksummed.toLowerCase()
-  if (!chainId) {
-    throw new Error('chainId is empty')
-  }
+
+  invariant(chainId != null, 'chainId is empty')
 
   const pilotAddress =
-    (route.initiator &&
-      parsePrefixedAddress(route.initiator)[1].toLowerCase()) ||
+    (route.initiator && parsePrefixedAddress(route.initiator).toLowerCase()) ||
     ''
 
   const moduleWaypoint = route.waypoints?.find(

extension/src/panel/pages/routes/edit.$routeId/useConnectionDryRun.tsx

@@ -1,6 +1,6 @@
 import { useExecutionRoute, useRouteConnect } from '@/execution-routes'
 import { getReadOnlyProvider } from '@/providers'
-import type { JsonRpcError, LegacyConnection } from '@/types'
+import type { HexAddress, JsonRpcError, LegacyConnection } from '@/types'
 import {
   decodeGenericError,
   decodeRoleKey,
@@ -136,7 +136,7 @@ async function dryRun(connection: LegacyConnection) {
     {
       to: '0x0000000000000000000000000000000000000000',
       data: '0x00000000',
-      from: connection.avatarAddress,
+      from: connection.avatarAddress as HexAddress,
     },
     connection,
     false,

extension/src/panel/pages/routes/edit.$routeId/wallet/ConnectWallet.tsx

@@ -96,7 +96,7 @@ const getPilotAddress = (route: ExecutionRoute) => {
     return null
   }
 
-  const address = parsePrefixedAddress(route.initiator)[1].toLowerCase()
+  const address = parsePrefixedAddress(route.initiator).toLowerCase()
 
   if (address === ZeroAddress) {
     return null

extension/src/panel/pages/routes/edit.$routeId/wrapRequest.ts

@@ -1,6 +1,7 @@
-import type { LegacyConnection, TransactionData } from '@/types'
+import type { HexAddress, LegacyConnection, TransactionData } from '@/types'
 import { ContractFactories, KnownContracts } from '@gnosis.pm/zodiac'
-import type { MetaTransactionData } from '@safe-global/safe-core-sdk-types'
+import { toQuantity } from 'ethers'
+import type { MetaTransactionRequest } from 'ser-kit'
 
 const RolesV1Interface =
   ContractFactories[KnownContracts.ROLES_V1].createInterface()
@@ -9,7 +10,7 @@ const RolesV2Interface =
 const DelayInterface = ContractFactories[KnownContracts.DELAY].createInterface()
 
 export function wrapRequest(
-  request: MetaTransactionData | TransactionData,
+  request: MetaTransactionRequest | TransactionData,
   connection: LegacyConnection,
   revertOnError = true,
 ): TransactionData {
@@ -53,9 +54,9 @@ export function wrapRequest(
   }
 
   return {
-    from: connection.pilotAddress,
-    to: connection.moduleAddress,
-    data: data,
-    value: '0x0',
+    from: connection.pilotAddress as HexAddress,
+    to: connection.moduleAddress as HexAddress,
+    data: data as HexAddress,
+    value: toQuantity(0n),
   }
 }

extension/src/panel/pages/transactions/RolePermissionCheck.tsx

@@ -9,20 +9,21 @@ import {
   decodeRolesV1Error,
   decodeRolesV2Error,
 } from '@/utils'
-import type { MetaTransactionData } from '@safe-global/safe-core-sdk-types'
+import { invariant } from '@epic-web/invariant'
 import { toQuantity, ZeroAddress } from 'ethers'
 import { Check, TriangleAlert, UsersRound } from 'lucide-react'
 import { useEffect, useState } from 'react'
 import {
   ExecutionActionType,
   parsePrefixedAddress,
   planExecution,
+  type MetaTransactionRequest,
   type Route as SerRoute,
 } from 'ser-kit'
 import { Translate } from './Translate'
 
 const simulateRolesTransaction = async (
-  encodedTransaction: MetaTransactionData,
+  encodedTransaction: MetaTransactionRequest,
   route: ExecutionRoute,
   provider: Eip1193Provider,
 ) => {
@@ -32,19 +33,20 @@ const simulateRolesTransaction = async (
   const plan = await planExecution([encodedTransaction], routeWithInitiator)
 
   // TODO generalize permission checking logic (ser-kit)
-  if (plan.length > 1) {
-    throw new Error('Multi-step execution not yet supported')
-  }
+  invariant(plan.length <= 1, 'Multi-step execution not yet supported')
 
-  if (plan[0]?.type !== ExecutionActionType.EXECUTE_TRANSACTION) {
-    throw new Error('Only transaction execution is currently supported')
-  }
+  const [action] = plan
+
+  invariant(
+    action != null && action.type === ExecutionActionType.EXECUTE_TRANSACTION,
+    'Only transaction execution is currently supported',
+  )
 
-  const [, from] = parsePrefixedAddress(plan[0].from)
+  const from = parsePrefixedAddress(action.from)
   const tx = {
-    ...plan[0].transaction,
+    ...action.transaction,
     from,
-    value: toQuantity(BigInt(plan[0].transaction.value || 0)),
+    value: toQuantity(BigInt(action.transaction.value || 0)),
   }
 
   try {
@@ -66,11 +68,11 @@ const simulateRolesTransaction = async (
         return RolesV2Status[decodedError.args.status]
       }
       return decodedError.name
-    } else {
-      const genericError = decodeGenericError(e as JsonRpcError)
-      if (genericError === 'Module not authorized') {
-        return 'Not a member of any role'
-      }
+    }
+
+    const genericError = decodeGenericError(e as JsonRpcError)
+    if (genericError === 'Module not authorized') {
+      return 'Not a member of any role'
     }
   }
 

extension/src/panel/pages/transactions/Submit.tsx

@@ -107,7 +107,7 @@ export const Submit = () => {
       console.debug(
         `Transaction batch has been proposed with safeTxHash ${safeTxHash}`,
       )
-      const [, avatarAddress] = parsePrefixedAddress(avatar)
+      const avatarAddress = parsePrefixedAddress(avatar)
       successToast({
         title: 'Transaction batch has been proposed for execution',
         message: (