chore(pilot-app): update account instead of only pilot address

.cspell.json

@@ -87,6 +87,7 @@
     "TTFB",
     "Uids",
     "UNWRAPPER",
+    "vitalik",
     "vercel",
     "viem",
     "vnet",

deployables/app/app/components/wallet/Connect.tsx

@@ -5,7 +5,7 @@ import { useAccountEffect } from 'wagmi'
 
 export type OnConnectArgs = {
   providerType: ProviderType
-  account: HexAddress
+  address: HexAddress
 }
 
 type ConnectProps = {
@@ -24,7 +24,7 @@ export const Connect = ({ onConnect }: ConnectProps) => {
       }
 
       onConnect({
-        account: address,
+        address,
         providerType:
           connector.type === 'injected'
             ? ProviderType.InjectedWallet

deployables/app/app/components/wallet/ConnectWallet.tsx

@@ -104,7 +104,7 @@ const useAutoReconnect = ({
     }
 
     onConnectRef.current({
-      account: address,
+      address,
       providerType:
         connector.type === 'injected'
           ? ProviderType.InjectedWallet

deployables/app/app/routes/edit-route.$data.tsx

@@ -18,6 +18,8 @@ import {
 } from '@zodiac/form-data'
 import { CompanionAppMessageType } from '@zodiac/messages'
 import {
+  createAccount,
+  createEoaAccount,
   getRolesVersion,
   queryRolesV1MultiSend,
   queryRolesV2MultiSend,
@@ -26,10 +28,10 @@ import {
   updateAvatar,
   updateChainId,
   updateLabel,
-  updatePilotAddress,
   updateProviderType,
   updateRoleId,
   updateRolesWaypoint,
+  updateStartingPoint,
   zodiacModuleSchema,
   type ZodiacModule,
 } from '@zodiac/modules'
@@ -154,17 +156,23 @@ export const clientAction = async ({
     case Intent.ConnectWallet: {
       const route = parseRouteData(params.data)
 
-      const account = getHexString(data, 'account')
+      const address = getHexString(data, 'address')
       const providerType = verifyProviderType(getInt(data, 'providerType'))
+      const account = await createAccount(
+        jsonRpcProvider(getChainId(route.avatar)),
+        address,
+      )
 
       return editRoute(
-        updatePilotAddress(updateProviderType(route, providerType), account),
+        updateStartingPoint(updateProviderType(route, providerType), account),
       )
     }
     case Intent.DisconnectWallet: {
       const route = parseRouteData(params.data)
 
-      return editRoute(updatePilotAddress(route, ZERO_ADDRESS))
+      return editRoute(
+        updateStartingPoint(route, createEoaAccount({ address: ZERO_ADDRESS })),
+      )
     }
 
     default:
@@ -194,11 +202,11 @@ const EditRoute = ({
               <ConnectWallet
                 chainId={chainId}
                 pilotAddress={optimisticRoute.pilotAddress}
-                onConnect={({ account, providerType }) => {
+                onConnect={({ address, providerType }) => {
                   submit(
                     formData({
                       intent: Intent.ConnectWallet,
-                      account,
+                      address,
                       providerType,
                     }),
                     { method: 'POST' },
@@ -341,7 +349,7 @@ const useOptimisticRoute = () => {
 
       case Intent.ConnectWallet: {
         setOptimisticConnection({
-          pilotAddress: getHexString(formData, 'account'),
+          pilotAddress: getHexString(formData, 'address'),
         })
       }
     }

packages/modules/src/createAccount.spec.ts

@@ -0,0 +1,34 @@
+import { Chain } from '@zodiac/chains'
+import { getDefaultProvider } from 'ethers'
+import { AccountType, formatPrefixedAddress } from 'ser-kit'
+import { describe, expect, it } from 'vitest'
+import { createAccount } from './createAccount'
+
+describe('createAccount', () => {
+  const ethProvider = getDefaultProvider(1)
+
+  it('creates an EAO account if the passed address does not have code', async () => {
+    const vitalikEoaAddress = '0xd8da6bf26964af9d7eed9e03e53415d37aa96045'
+
+    const account = await createAccount(ethProvider, vitalikEoaAddress)
+
+    expect(account).toEqual({
+      type: AccountType.EOA,
+      address: vitalikEoaAddress,
+      prefixedAddress: formatPrefixedAddress(undefined, vitalikEoaAddress),
+    })
+  })
+  it('creates a Safe account if the passed address has code', async () => {
+    const gnosisDaoTreasury = '0x849d52316331967b6ff1198e5e32a0eb168d039d'
+
+    const account = await createAccount(ethProvider, gnosisDaoTreasury)
+
+    expect(account).toEqual({
+      type: AccountType.SAFE,
+      address: gnosisDaoTreasury,
+      prefixedAddress: formatPrefixedAddress(Chain.ETH, gnosisDaoTreasury),
+      threshold: NaN,
+      chain: Chain.ETH,
+    })
+  })
+})

packages/modules/src/createAccount.ts

@@ -0,0 +1,22 @@
+import { verifyChainId } from '@zodiac/chains'
+import type { HexAddress } from '@zodiac/schema'
+import type { Provider } from 'ethers'
+import { createEoaAccount } from './createEoaAccount'
+import { createSafeAccount } from './createSafeAccount'
+
+export const createAccount = async (
+  provider: Provider,
+  address: HexAddress,
+) => {
+  const isEoa = (await provider.getCode(address)) === '0x'
+  const network = await provider.getNetwork()
+
+  if (isEoa) {
+    return createEoaAccount({ address })
+  }
+
+  return createSafeAccount({
+    address,
+    chainId: verifyChainId(Number(network.chainId)),
+  })
+}

packages/modules/src/index.ts

@@ -1,4 +1,6 @@
+export { createAccount } from './createAccount'
 export { createBlankRoute } from './createBlankRoute'
+export { createEoaAccount } from './createEoaAccount'
 export { createEoaStartingPoint } from './createEoaStartingPoint'
 export { fetchZodiacModules } from './fetchZodiacModules'
 export { getPilotAddress } from './getPilotAddress'
@@ -16,10 +18,10 @@ export { decodeRoleKey, encodeRoleKey } from './roleKey'
 export { updateAvatar } from './updateAvatar'
 export { updateChainId } from './updateChainId'
 export { updateLabel } from './updateLabel'
-export { updatePilotAddress } from './updatePilotAddress'
 export { updateProviderType } from './updateProviderType'
 export { updateRoleId } from './updateRoleId'
 export { updateRolesWaypoint } from './updateRolesWaypoint'
+export { updateStartingPoint } from './updateStartingPoint'
 export {
   SUPPORTED_ZODIAC_MODULES,
   SupportedZodiacModuleType,