From 931764ef9bef367d66f28bc8e4edf6d5079f842a Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Sun, 2 Jun 2024 23:11:38 +0400
Subject: [PATCH 01/29] feat: add setAlias to starknet eth sign

---
 apps/ui/src/composables/useActions.ts         |  8 +++++-
 apps/ui/src/networks/starknet/actions.ts      |  7 +++++-
 .../clients/starknet/ethereum-sig/index.ts    | 25 +++++++++++++++++--
 .../clients/starknet/ethereum-sig/types.ts    |  8 ++++++
 packages/sx.js/src/types/index.ts             | 10 +++++++-
 5 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
index 337d919d8..f5a4b9cfe 100644
--- a/apps/ui/src/composables/useActions.ts
+++ b/apps/ui/src/composables/useActions.ts
@@ -13,8 +13,12 @@ import type {
   VoteType
 } from '@/types';
 import type { Connector, StrategyConfig } from '@/networks/types';
+import { starknetNetworks } from '@snapshot-labs/sx';
 
 const offchainNetworkId = offchainNetworks.filter(network => enabledNetworks.includes(network))[0];
+const starknetNetworkId = (Object.keys(starknetNetworks) as NetworkID[])
+  .filter(network => enabledNetworks.includes(network))
+  .pop() as NetworkID;
 
 export function useActions() {
   const { mixpanel } = useMixpanel();
@@ -107,7 +111,9 @@ export function useActions() {
   }
 
   async function getAliasSigner() {
-    const network = getNetwork(offchainNetworkId);
+    const network = getNetwork(
+      web3.value.type === 'argentx' ? starknetNetworkId : offchainNetworkId
+    );
 
     return alias.getAliasWallet(address =>
       wrapPromise(offchainNetworkId, network.actions.setAlias(auth.web3, address))
diff --git a/apps/ui/src/networks/starknet/actions.ts b/apps/ui/src/networks/starknet/actions.ts
index 93e6ed94b..b7de9566b 100644
--- a/apps/ui/src/networks/starknet/actions.ts
+++ b/apps/ui/src/networks/starknet/actions.ts
@@ -582,7 +582,12 @@ export function createActions(
     },
     followSpace: () => {},
     unfollowSpace: () => {},
-    setAlias: () => {},
+    setAlias(web3: any, alias: string) {
+      return ethSigClient.setAlias({
+        signer: web3.getSigner(),
+        data: { alias }
+      });
+    },
     send: (envelope: any) => starkSigClient.send(envelope) // TODO: extract it out of client to common helper
   };
 }
diff --git a/packages/sx.js/src/clients/starknet/ethereum-sig/index.ts b/packages/sx.js/src/clients/starknet/ethereum-sig/index.ts
index 22651378c..36b05a5ae 100644
--- a/packages/sx.js/src/clients/starknet/ethereum-sig/index.ts
+++ b/packages/sx.js/src/clients/starknet/ethereum-sig/index.ts
@@ -2,7 +2,7 @@ import randomBytes from 'randombytes';
 import { Signer, TypedDataSigner, TypedDataField } from '@ethersproject/abstract-signer';
 import { CallData, shortString } from 'starknet';
 import { getStrategiesWithParams } from '../../../utils/strategies';
-import { proposeTypes, updateProposalTypes, voteTypes } from './types';
+import { proposeTypes, updateProposalTypes, voteTypes, aliasTypes } from './types';
 import {
   ClientConfig,
   ClientOpts,
@@ -10,9 +10,11 @@ import {
   Propose,
   UpdateProposal,
   Vote,
+  Alias,
   EIP712ProposeMessage,
   EIP712UpdateProposalMessage,
   EIP712VoteMessage,
+  EIP712AliasMessage,
   SignatureData
 } from '../../../types';
 import { getRSVFromSig } from '../../../utils/encoding';
@@ -29,7 +31,11 @@ export class EthereumSig {
   }
 
   public async sign<
-    T extends EIP712ProposeMessage | EIP712UpdateProposalMessage | EIP712VoteMessage
+    T extends
+      | EIP712ProposeMessage
+      | EIP712UpdateProposalMessage
+      | EIP712VoteMessage
+      | EIP712AliasMessage
   >(
     signer: Signer & TypedDataSigner,
     message: T,
@@ -164,4 +170,19 @@ export class EthereumSig {
       data
     };
   }
+
+  public async setAlias({
+    signer,
+    data
+  }: {
+    signer: Signer & TypedDataSigner;
+    data: Alias;
+  }): Promise<Envelope<Alias>> {
+    const signatureData = await this.sign(signer, data, aliasTypes, 'SetAlias');
+
+    return {
+      signatureData,
+      data
+    };
+  }
 }
diff --git a/packages/sx.js/src/clients/starknet/ethereum-sig/types.ts b/packages/sx.js/src/clients/starknet/ethereum-sig/types.ts
index de526e1ed..e3d4a5a70 100644
--- a/packages/sx.js/src/clients/starknet/ethereum-sig/types.ts
+++ b/packages/sx.js/src/clients/starknet/ethereum-sig/types.ts
@@ -50,3 +50,11 @@ export const updateProposalTypes = {
   ],
   Strategy: sharedTypes.Strategy
 };
+
+export const aliasTypes = {
+  Alias: [
+    { name: 'from', type: 'address' },
+    { name: 'alias', type: 'address' },
+    { name: 'timestamp', type: 'uint64' }
+  ]
+};
diff --git a/packages/sx.js/src/types/index.ts b/packages/sx.js/src/types/index.ts
index 4b732dae8..e4c60e7cc 100644
--- a/packages/sx.js/src/types/index.ts
+++ b/packages/sx.js/src/types/index.ts
@@ -131,7 +131,11 @@ export type Vote = {
   choice: Choice;
 };
 
-export type Message = Propose | Vote | UpdateProposal;
+export type Alias = {
+  alias: string;
+};
+
+export type Message = Propose | Vote | UpdateProposal | Alias;
 
 export type SignatureData = {
   address: string;
@@ -197,6 +201,10 @@ export type EIP712VoteMessage = Omit<StarknetEIP712VoteMessage, 'proposalId'> &
   proposalId: string;
 };
 
+export type EIP712AliasMessage = {
+  alias: string;
+};
+
 export type StrategiesAddresses = { index: number; address: string }[];
 
 export type ExecutionInput = {

From ea49ce74f1839b507821e42371c32052fd3fbccd Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:36:13 +0400
Subject: [PATCH 02/29] fix: use starknet-sig instead of ethereum-sig

---
 apps/ui/src/networks/starknet/actions.ts      |  4 +--
 .../clients/starknet/ethereum-sig/index.ts    | 25 ++-----------------
 .../clients/starknet/ethereum-sig/types.ts    |  8 ------
 .../clients/starknet/starknet-sig/index.ts    | 20 ++++++++++++++-
 .../clients/starknet/starknet-sig/types.ts    |  8 ++++++
 packages/sx.js/src/types/index.ts             |  8 +++---
 6 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/apps/ui/src/networks/starknet/actions.ts b/apps/ui/src/networks/starknet/actions.ts
index b7de9566b..36d7203c5 100644
--- a/apps/ui/src/networks/starknet/actions.ts
+++ b/apps/ui/src/networks/starknet/actions.ts
@@ -583,8 +583,8 @@ export function createActions(
     followSpace: () => {},
     unfollowSpace: () => {},
     setAlias(web3: any, alias: string) {
-      return ethSigClient.setAlias({
-        signer: web3.getSigner(),
+      return starkSigClient.setAlias({
+        signer: web3.provider.account,
         data: { alias }
       });
     },
diff --git a/packages/sx.js/src/clients/starknet/ethereum-sig/index.ts b/packages/sx.js/src/clients/starknet/ethereum-sig/index.ts
index 36b05a5ae..22651378c 100644
--- a/packages/sx.js/src/clients/starknet/ethereum-sig/index.ts
+++ b/packages/sx.js/src/clients/starknet/ethereum-sig/index.ts
@@ -2,7 +2,7 @@ import randomBytes from 'randombytes';
 import { Signer, TypedDataSigner, TypedDataField } from '@ethersproject/abstract-signer';
 import { CallData, shortString } from 'starknet';
 import { getStrategiesWithParams } from '../../../utils/strategies';
-import { proposeTypes, updateProposalTypes, voteTypes, aliasTypes } from './types';
+import { proposeTypes, updateProposalTypes, voteTypes } from './types';
 import {
   ClientConfig,
   ClientOpts,
@@ -10,11 +10,9 @@ import {
   Propose,
   UpdateProposal,
   Vote,
-  Alias,
   EIP712ProposeMessage,
   EIP712UpdateProposalMessage,
   EIP712VoteMessage,
-  EIP712AliasMessage,
   SignatureData
 } from '../../../types';
 import { getRSVFromSig } from '../../../utils/encoding';
@@ -31,11 +29,7 @@ export class EthereumSig {
   }
 
   public async sign<
-    T extends
-      | EIP712ProposeMessage
-      | EIP712UpdateProposalMessage
-      | EIP712VoteMessage
-      | EIP712AliasMessage
+    T extends EIP712ProposeMessage | EIP712UpdateProposalMessage | EIP712VoteMessage
   >(
     signer: Signer & TypedDataSigner,
     message: T,
@@ -170,19 +164,4 @@ export class EthereumSig {
       data
     };
   }
-
-  public async setAlias({
-    signer,
-    data
-  }: {
-    signer: Signer & TypedDataSigner;
-    data: Alias;
-  }): Promise<Envelope<Alias>> {
-    const signatureData = await this.sign(signer, data, aliasTypes, 'SetAlias');
-
-    return {
-      signatureData,
-      data
-    };
-  }
 }
diff --git a/packages/sx.js/src/clients/starknet/ethereum-sig/types.ts b/packages/sx.js/src/clients/starknet/ethereum-sig/types.ts
index e3d4a5a70..de526e1ed 100644
--- a/packages/sx.js/src/clients/starknet/ethereum-sig/types.ts
+++ b/packages/sx.js/src/clients/starknet/ethereum-sig/types.ts
@@ -50,11 +50,3 @@ export const updateProposalTypes = {
   ],
   Strategy: sharedTypes.Strategy
 };
-
-export const aliasTypes = {
-  Alias: [
-    { name: 'from', type: 'address' },
-    { name: 'alias', type: 'address' },
-    { name: 'timestamp', type: 'uint64' }
-  ]
-};
diff --git a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
index 24d55cfba..7776b9693 100644
--- a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
+++ b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
@@ -1,7 +1,7 @@
 import randomBytes from 'randombytes';
 import { Account, CallData, shortString, typedData, uint256 } from 'starknet';
 import { getStrategiesWithParams } from '../../../utils/strategies';
-import { baseDomain, proposeTypes, updateProposalTypes, voteTypes } from './types';
+import { aliasTypes, baseDomain, proposeTypes, updateProposalTypes, voteTypes } from './types';
 import {
   ClientConfig,
   ClientOpts,
@@ -9,9 +9,11 @@ import {
   Propose,
   UpdateProposal,
   Vote,
+  Alias,
   StarknetEIP712ProposeMessage,
   StarknetEIP712UpdateProposalMessage,
   StarknetEIP712VoteMessage,
+  StarknetEIP712AliasMessage,
   SignatureData
 } from '../../../types';
 
@@ -55,6 +57,7 @@ export class StarknetSig {
       | StarknetEIP712ProposeMessage
       | StarknetEIP712UpdateProposalMessage
       | StarknetEIP712VoteMessage
+      | StarknetEIP712AliasMessage
   >(
     signer: Account,
     verifyingContract: string,
@@ -198,4 +201,19 @@ export class StarknetSig {
       data
     };
   }
+
+  public async setAlias({
+    signer,
+    data
+  }: {
+    signer: Account;
+    data: Alias;
+  }): Promise<Envelope<Alias>> {
+    const signatureData = await this.sign(signer, '', data, aliasTypes, 'SetAlias');
+
+    return {
+      signatureData,
+      data
+    };
+  }
 }
diff --git a/packages/sx.js/src/clients/starknet/starknet-sig/types.ts b/packages/sx.js/src/clients/starknet/starknet-sig/types.ts
index 1ae6bfa17..2378dd410 100644
--- a/packages/sx.js/src/clients/starknet/starknet-sig/types.ts
+++ b/packages/sx.js/src/clients/starknet/starknet-sig/types.ts
@@ -67,3 +67,11 @@ export const updateProposalTypes = {
   Strategy: sharedTypes.Strategy,
   u256: sharedTypes.u256
 };
+
+export const aliasTypes = {
+  Alias: [
+    { name: 'from', type: 'address' },
+    { name: 'alias', type: 'address' },
+    { name: 'timestamp', type: 'uint64' }
+  ]
+};
diff --git a/packages/sx.js/src/types/index.ts b/packages/sx.js/src/types/index.ts
index e4c60e7cc..ebd1b9faf 100644
--- a/packages/sx.js/src/types/index.ts
+++ b/packages/sx.js/src/types/index.ts
@@ -184,6 +184,10 @@ export type StarknetEIP712VoteMessage = {
   metadataUri: string[];
 };
 
+export type StarknetEIP712AliasMessage = {
+  alias: string;
+};
+
 export type EIP712ProposeMessage = StarknetEIP712ProposeMessage & {
   authenticator: string;
 };
@@ -201,10 +205,6 @@ export type EIP712VoteMessage = Omit<StarknetEIP712VoteMessage, 'proposalId'> &
   proposalId: string;
 };
 
-export type EIP712AliasMessage = {
-  alias: string;
-};
-
 export type StrategiesAddresses = { index: number; address: string }[];
 
 export type ExecutionInput = {

From ebb759cf4477c911d5e5f8b1601ea132862222c7 Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:52:30 +0400
Subject: [PATCH 03/29] fix: fix signature schema

---
 .../sx.js/src/clients/starknet/starknet-sig/index.ts     | 9 +++++++--
 .../sx.js/src/clients/starknet/starknet-sig/types.ts     | 9 +++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
index 7776b9693..639ae3b3f 100644
--- a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
+++ b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
@@ -77,7 +77,6 @@ export class StarknetSig {
       domain,
       message
     };
-
     const signature = await signer.signMessage(data);
 
     return {
@@ -209,7 +208,13 @@ export class StarknetSig {
     signer: Account;
     data: Alias;
   }): Promise<Envelope<Alias>> {
-    const signatureData = await this.sign(signer, '', data, aliasTypes, 'SetAlias');
+    const message = {
+      from: signer.address,
+      timestamp: parseInt((Date.now() / 1e3).toFixed()),
+      ...data
+    };
+
+    const signatureData = await this.sign(signer, '', message, aliasTypes, 'SetAlias');
 
     return {
       signatureData,
diff --git a/packages/sx.js/src/clients/starknet/starknet-sig/types.ts b/packages/sx.js/src/clients/starknet/starknet-sig/types.ts
index 2378dd410..3468a3cd2 100644
--- a/packages/sx.js/src/clients/starknet/starknet-sig/types.ts
+++ b/packages/sx.js/src/clients/starknet/starknet-sig/types.ts
@@ -69,9 +69,10 @@ export const updateProposalTypes = {
 };
 
 export const aliasTypes = {
-  Alias: [
-    { name: 'from', type: 'address' },
-    { name: 'alias', type: 'address' },
-    { name: 'timestamp', type: 'uint64' }
+  StarkNetDomain: domainTypes.StarkNetDomain,
+  SetAlias: [
+    { name: 'from', type: 'ContractAddress' },
+    { name: 'alias', type: 'string' },
+    { name: 'timestamp', type: 'felt' }
   ]
 };

From 9859d9cfd05a634fda3076eba703c0d61abbbf76 Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:56:39 +0400
Subject: [PATCH 04/29] fix: update type to include optional properties

---
 packages/sx.js/src/types/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/sx.js/src/types/index.ts b/packages/sx.js/src/types/index.ts
index ebd1b9faf..804c478eb 100644
--- a/packages/sx.js/src/types/index.ts
+++ b/packages/sx.js/src/types/index.ts
@@ -186,6 +186,8 @@ export type StarknetEIP712VoteMessage = {
 
 export type StarknetEIP712AliasMessage = {
   alias: string;
+  from?: string;
+  timestamp?: number;
 };
 
 export type EIP712ProposeMessage = StarknetEIP712ProposeMessage & {

From 00fb94969792fa7fa30fa849847b3bcc03ca2283 Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Tue, 2 Jul 2024 10:13:57 +0900
Subject: [PATCH 05/29] fix: more robust starknet wallet detection

---
 apps/ui/src/composables/useActions.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
index 16f33f663..75d370a57 100644
--- a/apps/ui/src/composables/useActions.ts
+++ b/apps/ui/src/composables/useActions.ts
@@ -15,6 +15,7 @@ import type {
 } from '@/types';
 import type { Connector, StrategyConfig } from '@/networks/types';
 import { starknetNetworks } from '@snapshot-labs/sx';
+import { STARKNET_CONNECTORS } from '@/networks/common/constants';
 
 const offchainNetworkId = offchainNetworks.filter(network => enabledNetworks.includes(network))[0];
 const starknetNetworkId = (Object.keys(starknetNetworks) as NetworkID[])
@@ -123,7 +124,9 @@ export function useActions() {
 
   async function getAliasSigner() {
     const network = getNetwork(
-      web3.value.type === 'argentx' ? starknetNetworkId : offchainNetworkId
+      STARKNET_CONNECTORS.includes(web3.value.type as Connector)
+        ? starknetNetworkId
+        : offchainNetworkId
     );
 
     return alias.getAliasWallet(address =>

From 2bde73b56d59ae5d1495d5c2c0ad8c9817e0bea7 Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Tue, 2 Jul 2024 10:22:45 +0900
Subject: [PATCH 06/29] fix: enable back follow button for starknet wallet

---
 apps/ui/src/components/ButtonFollow.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/ui/src/components/ButtonFollow.vue b/apps/ui/src/components/ButtonFollow.vue
index 1664139be..25d4affb6 100644
--- a/apps/ui/src/components/ButtonFollow.vue
+++ b/apps/ui/src/components/ButtonFollow.vue
@@ -9,10 +9,8 @@ const spaceIdComposite = `${props.space.network}:${props.space.id}`;
 
 const { isSafeWallet } = useSafeWallet(props.space.network, props.space.snapshot_chain_id);
 const followedSpacesStore = useFollowedSpacesStore();
-const { web3 } = useWeb3();
 
 const spaceFollowed = computed(() => followedSpacesStore.isFollowed(spaceIdComposite));
-const hidden = computed(() => web3.value?.type === 'argentx');
 
 const loading = computed(
   () =>
@@ -23,7 +21,6 @@ const loading = computed(
 
 <template>
   <UiButton
-    v-if="!hidden"
     :disabled="loading || isSafeWallet"
     class="group"
     :class="{ 'hover:border-skin-danger': spaceFollowed }"

From b92f061b622399f7d46840aa4724e05dbd0fd2aa Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Tue, 2 Jul 2024 10:22:50 +0900
Subject: [PATCH 07/29] fix: fix typing

---
 apps/ui/src/networks/starknet/actions.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/ui/src/networks/starknet/actions.ts b/apps/ui/src/networks/starknet/actions.ts
index e3cc030c8..f3ba8b1ef 100644
--- a/apps/ui/src/networks/starknet/actions.ts
+++ b/apps/ui/src/networks/starknet/actions.ts
@@ -590,6 +590,7 @@ export function createActions(
         data: { alias }
       });
     },
+    updateUser: () => {},
     send: (envelope: any) => starkSigClient.send(envelope) // TODO: extract it out of client to common helper
   };
 }

From 8b6c92d4e50178d64b07bbbd38c1596e400224ca Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Tue, 2 Jul 2024 19:10:45 +0900
Subject: [PATCH 08/29] feat: add support for starknet signature for offchain
 `send`

---
 .../src/clients/offchain/ethereum-sig/index.ts   | 16 ++++++++++++----
 packages/sx.js/src/clients/offchain/types.ts     | 11 +----------
 .../src/clients/starknet/starknet-sig/index.ts   |  3 +--
 packages/sx.js/src/types/index.ts                |  8 +++++---
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/sx.js/src/clients/offchain/ethereum-sig/index.ts b/packages/sx.js/src/clients/offchain/ethereum-sig/index.ts
index 9cf937173..61d71b921 100644
--- a/packages/sx.js/src/clients/offchain/ethereum-sig/index.ts
+++ b/packages/sx.js/src/clients/offchain/ethereum-sig/index.ts
@@ -18,7 +18,6 @@ import {
 } from './types';
 import type { Signer, TypedDataSigner, TypedDataField } from '@ethersproject/abstract-signer';
 import {
-  type SignatureData,
   type Envelope,
   type Vote,
   type Propose,
@@ -38,7 +37,7 @@ import {
   type EIP712SetAliasMessage,
   type EIP712UpdateUserMessage
 } from '../types';
-import type { OffchainNetworkConfig } from '../../../types';
+import type { OffchainNetworkConfig, SignatureData } from '../../../types';
 
 const SEQUENCER_URLS: Record<OffchainNetworkConfig['eip712ChainId'], string> = {
   1: 'https://seq.snapshot.org',
@@ -102,8 +101,15 @@ export class EthereumSig {
       Vote | Propose | UpdateProposal | CancelProposal | FollowSpace | UnfollowSpace | SetAlias
     >
   ) {
-    const { address, signature: sig, domain, types, message } = envelope.signatureData!;
-    const payload = {
+    const {
+      address,
+      signature: sig,
+      domain,
+      types,
+      primaryType,
+      message
+    } = envelope.signatureData!;
+    const payload: any = {
       address,
       sig,
       data: {
@@ -113,6 +119,8 @@ export class EthereumSig {
       }
     };
 
+    if (primaryType) payload.data.primaryType = primaryType;
+
     const body = {
       method: 'POST',
       headers: {
diff --git a/packages/sx.js/src/clients/offchain/types.ts b/packages/sx.js/src/clients/offchain/types.ts
index 9cdc9ed4d..c004d8103 100644
--- a/packages/sx.js/src/clients/offchain/types.ts
+++ b/packages/sx.js/src/clients/offchain/types.ts
@@ -1,16 +1,7 @@
-import type { TypedDataDomain, TypedDataField } from '@ethersproject/abstract-signer';
-import type { Privacy } from '../../types';
+import type { Privacy, SignatureData } from '../../types';
 
 export type Choice = number | number[] | string | Record<string, number>;
 
-export type SignatureData = {
-  address: string;
-  signature: string;
-  domain: TypedDataDomain;
-  types: Record<string, TypedDataField[]>;
-  message: Record<string, any>;
-};
-
 export type Envelope<
   T extends
     | Vote
diff --git a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
index 639ae3b3f..1a08882bf 100644
--- a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
+++ b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
@@ -84,8 +84,7 @@ export class StarknetSig {
       signature: Array.isArray(signature)
         ? signature.map(v => `0x${BigInt(v).toString(16)}`)
         : [`0x${signature.r.toString(16)}`, `0x${signature.s.toString(16)}`],
-      message,
-      primaryType
+      ...data
     };
   }
 
diff --git a/packages/sx.js/src/types/index.ts b/packages/sx.js/src/types/index.ts
index 804c478eb..5320a50b2 100644
--- a/packages/sx.js/src/types/index.ts
+++ b/packages/sx.js/src/types/index.ts
@@ -1,5 +1,5 @@
-import type { BigNumberish, RpcProvider } from 'starknet';
-import type { Call } from 'starknet';
+import type { Call, BigNumberish, RpcProvider, StarkNetType } from 'starknet';
+import type { TypedDataDomain, TypedDataField } from '@ethersproject/abstract-signer';
 import type { MetaTransaction } from '../utils/encoding';
 import type { NetworkConfig } from './networkConfig';
 
@@ -141,8 +141,10 @@ export type SignatureData = {
   address: string;
   commitTxId?: string;
   commitHash?: string;
-  signature?: string[] | null;
+  signature?: string | string[] | null;
   message?: Record<string, any>;
+  domain?: TypedDataDomain;
+  types?: Record<string, TypedDataField[] | StarkNetType[]>;
   primaryType?: any;
 };
 

From 772bf736355d76d00148933f509ecdfab5bd88cc Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Thu, 4 Jul 2024 13:56:26 +0900
Subject: [PATCH 09/29] fix: use string type to allow starknet address

---
 packages/sx.js/src/clients/offchain/ethereum-sig/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts b/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts
index d37c2c327..c5b87864d 100644
--- a/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts
+++ b/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts
@@ -103,7 +103,7 @@ export const cancelProposalTypes = {
 
 export const followSpaceTypes = {
   Follow: [
-    { name: 'from', type: 'address' },
+    { name: 'from', type: 'string' },
     { name: 'network', type: 'string' },
     { name: 'space', type: 'string' },
     { name: 'timestamp', type: 'uint64' }

From df9d133a0cc984a002a71578061f78bbe24e82cd Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Thu, 4 Jul 2024 14:14:11 +0900
Subject: [PATCH 10/29] fix: enable space following/unfollowing for starknet
 wallets

---
 apps/ui/src/stores/followedSpaces.ts                  | 11 +++--------
 .../sx.js/src/clients/offchain/ethereum-sig/types.ts  |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/apps/ui/src/stores/followedSpaces.ts b/apps/ui/src/stores/followedSpaces.ts
index 4e8abe366..a135aae5a 100644
--- a/apps/ui/src/stores/followedSpaces.ts
+++ b/apps/ui/src/stores/followedSpaces.ts
@@ -120,18 +120,13 @@ export const useFollowedSpacesStore = defineStore('followedSpaces', () => {
   }
 
   watch(
-    [
-      () => web3.value.account,
-      () => web3.value.type,
-      () => web3.value.authLoading,
-      () => authInitiated.value
-    ],
-    async ([web3, walletType, authLoading, authInitiated]) => {
+    [() => web3.value.account, () => web3.value.authLoading, () => authInitiated.value],
+    async ([web3, authLoading, authInitiated]) => {
       if (!authInitiated || authLoading) return;
 
       followedSpacesLoaded.value = false;
 
-      if (!web3 || walletType === 'argentx') {
+      if (!web3) {
         followedSpacesIds.value = [];
         followedSpacesLoaded.value = true;
         return;
diff --git a/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts b/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts
index c5b87864d..20082862c 100644
--- a/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts
+++ b/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts
@@ -112,7 +112,7 @@ export const followSpaceTypes = {
 
 export const unfollowSpaceTypes = {
   Unfollow: [
-    { name: 'from', type: 'address' },
+    { name: 'from', type: 'string' },
     { name: 'network', type: 'string' },
     { name: 'space', type: 'string' },
     { name: 'timestamp', type: 'uint64' }

From abbb177e2b34bec5a171908bf8bd85550792fa68 Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Thu, 4 Jul 2024 14:24:00 +0900
Subject: [PATCH 11/29] fix: enable user profile edition for starknet users

---
 apps/ui/src/views/User.vue                                | 2 +-
 packages/sx.js/src/clients/offchain/ethereum-sig/types.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/ui/src/views/User.vue b/apps/ui/src/views/User.vue
index ef5c8b233..12d25a6f3 100644
--- a/apps/ui/src/views/User.vue
+++ b/apps/ui/src/views/User.vue
@@ -110,7 +110,7 @@ watchEffect(() => setTitle(`${user.value?.name || id.value} user profile`));
       <div class="relative bg-skin-bg h-[16px] top-[-16px] rounded-t-[16px] md:hidden" />
       <div class="absolute right-4 top-4 space-x-2 flex">
         <DropdownShare :message="shareMsg" class="!px-0 w-[46px]" />
-        <UiTooltip v-if="web3.account === user.id && web3.type !== 'argentx'" title="Edit profile">
+        <UiTooltip v-if="web3.account === user.id" title="Edit profile">
           <UiButton class="!px-0 w-[46px]" @click="modalOpenEditUser = true">
             <IH-cog class="inline-block" />
           </UiButton>
diff --git a/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts b/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts
index 20082862c..006df3aaf 100644
--- a/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts
+++ b/packages/sx.js/src/clients/offchain/ethereum-sig/types.ts
@@ -129,7 +129,7 @@ export const aliasTypes = {
 
 export const updateUserTypes = {
   Profile: [
-    { name: 'from', type: 'address' },
+    { name: 'from', type: 'string' },
     { name: 'timestamp', type: 'uint64' },
     { name: 'profile', type: 'string' }
   ]

From 9938d89d456d2af8eab907b1f0f278b123aacf7e Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Sun, 14 Jul 2024 20:57:51 +0900
Subject: [PATCH 12/29] fix: use formatted address in alias from

---
 .../sx.js/src/clients/starknet/starknet-sig/index.ts  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
index 1a08882bf..d1631f1cd 100644
--- a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
+++ b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
@@ -1,5 +1,12 @@
 import randomBytes from 'randombytes';
-import { Account, CallData, shortString, typedData, uint256 } from 'starknet';
+import {
+  Account,
+  CallData,
+  shortString,
+  typedData,
+  uint256,
+  validateAndParseAddress
+} from 'starknet';
 import { getStrategiesWithParams } from '../../../utils/strategies';
 import { aliasTypes, baseDomain, proposeTypes, updateProposalTypes, voteTypes } from './types';
 import {
@@ -208,7 +215,7 @@ export class StarknetSig {
     data: Alias;
   }): Promise<Envelope<Alias>> {
     const message = {
-      from: signer.address,
+      from: validateAndParseAddress(signer.address),
       timestamp: parseInt((Date.now() / 1e3).toFixed()),
       ...data
     };

From 23001953ea80abc49d1dabe9989c8bdd7909221c Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Sun, 14 Jul 2024 23:31:54 +0900
Subject: [PATCH 13/29] fix: always use padded starknet address

---
 packages/sx.js/src/clients/starknet/starknet-sig/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
index d1631f1cd..bcb827239 100644
--- a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
+++ b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
@@ -87,7 +87,7 @@ export class StarknetSig {
     const signature = await signer.signMessage(data);
 
     return {
-      address: signer.address,
+      address: validateAndParseAddress(signer.address),
       signature: Array.isArray(signature)
         ? signature.map(v => `0x${BigInt(v).toString(16)}`)
         : [`0x${signature.r.toString(16)}`, `0x${signature.s.toString(16)}`],

From 8c9affdaea493cff373b21a58ad9a54b4fcf57ea Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Fri, 19 Jul 2024 13:21:36 +0900
Subject: [PATCH 14/29] fix: sign sn createAlias on the correct chainId

---
 apps/ui/src/composables/useActions.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
index 75d370a57..37275443c 100644
--- a/apps/ui/src/composables/useActions.ts
+++ b/apps/ui/src/composables/useActions.ts
@@ -20,7 +20,12 @@ import { STARKNET_CONNECTORS } from '@/networks/common/constants';
 const offchainNetworkId = offchainNetworks.filter(network => enabledNetworks.includes(network))[0];
 const starknetNetworkId = (Object.keys(starknetNetworks) as NetworkID[])
   .filter(network => enabledNetworks.includes(network))
-  .pop() as NetworkID;
+  .find(id => {
+    return (
+      (offchainNetworkId === 's' && id === 'sn') ||
+      (offchainNetworkId === 's-tn' && id === 'sn-sep')
+    );
+  }) as NetworkID;
 
 export function useActions() {
   const { mixpanel } = useMixpanel();

From 787b375c94e3c2be4359ee21ec98b4cd1a68d4cf Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Fri, 19 Jul 2024 14:20:42 +0900
Subject: [PATCH 15/29] chore: fix tests

---
 packages/sx.js/src/clients/starknet/starknet-sig/index.ts   | 3 ++-
 .../starknet/starknet-sig/__snapshots__/index.test.ts.snap  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
index bcb827239..84e256992 100644
--- a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
+++ b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
@@ -91,7 +91,8 @@ export class StarknetSig {
       signature: Array.isArray(signature)
         ? signature.map(v => `0x${BigInt(v).toString(16)}`)
         : [`0x${signature.r.toString(16)}`, `0x${signature.s.toString(16)}`],
-      ...data
+      message,
+      primaryType
     };
   }
 
diff --git a/packages/sx.js/test/unit/clients/starknet/starknet-sig/__snapshots__/index.test.ts.snap b/packages/sx.js/test/unit/clients/starknet/starknet-sig/__snapshots__/index.test.ts.snap
index 66be378af..9b5ac0276 100644
--- a/packages/sx.js/test/unit/clients/starknet/starknet-sig/__snapshots__/index.test.ts.snap
+++ b/packages/sx.js/test/unit/clients/starknet/starknet-sig/__snapshots__/index.test.ts.snap
@@ -20,7 +20,7 @@ exports[`StarknetSig > should create propose envelope 1`] = `
     ],
   },
   "signatureData": {
-    "address": "0x7d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
+    "address": "0x07d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
     "message": {
       "author": "0x7d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
       "executionStrategy": {
@@ -63,7 +63,7 @@ exports[`StarknetSig > should create update proposal envelope 1`] = `
     "space": "0x06330d3e48f59f5411c201ee2e9e9ccdc738fb3bb192b0e77e4eda26fa1a22f8",
   },
   "signatureData": {
-    "address": "0x7d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
+    "address": "0x07d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
     "message": {
       "author": "0x7d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
       "executionStrategy": {
@@ -107,7 +107,7 @@ exports[`StarknetSig > should create vote envelope 1`] = `
     ],
   },
   "signatureData": {
-    "address": "0x7d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
+    "address": "0x07d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
     "message": {
       "choice": "0x1",
       "metadataUri": [],

From 090a26687fe14ac563d67b21fe8066b9f77a3d42 Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Fri, 19 Jul 2024 15:18:09 +0900
Subject: [PATCH 16/29] fix: avoid loading votes from incompatible networks

---
 apps/ui/src/composables/useAccount.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/ui/src/composables/useAccount.ts b/apps/ui/src/composables/useAccount.ts
index 8052690b5..e61a9656e 100644
--- a/apps/ui/src/composables/useAccount.ts
+++ b/apps/ui/src/composables/useAccount.ts
@@ -1,4 +1,4 @@
-import { getNetwork } from '@/networks';
+import { getNetwork, offchainNetworks } from '@/networks';
 import type { NetworkID, Proposal, Vote } from '@/types';
 
 const { web3 } = useWeb3();
@@ -21,6 +21,8 @@ export function useAccount() {
     const account = web3.value.account;
     if (!account) return;
 
+    if (web3.value.type === 'argentx' && offchainNetworks.includes(networkId)) return;
+
     const network = getNetwork(networkId);
     const userVotes = await network.api.loadUserVotes(spaceIds, account);
 

From fc944ca14a2ddb2c76eaef48750a44549fc5250d Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Fri, 19 Jul 2024 16:38:34 +0900
Subject: [PATCH 17/29] fix: add types and domain to starknet envelope

---
 .../clients/starknet/starknet-sig/index.ts    |   2 +
 .../__snapshots__/index.test.ts.snap          | 206 ++++++++++++++++++
 2 files changed, 208 insertions(+)

diff --git a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
index 84e256992..9f17dd1df 100644
--- a/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
+++ b/packages/sx.js/src/clients/starknet/starknet-sig/index.ts
@@ -92,6 +92,8 @@ export class StarknetSig {
         ? signature.map(v => `0x${BigInt(v).toString(16)}`)
         : [`0x${signature.r.toString(16)}`, `0x${signature.s.toString(16)}`],
       message,
+      domain,
+      types,
       primaryType
     };
   }
diff --git a/packages/sx.js/test/unit/clients/starknet/starknet-sig/__snapshots__/index.test.ts.snap b/packages/sx.js/test/unit/clients/starknet/starknet-sig/__snapshots__/index.test.ts.snap
index 9b5ac0276..37b2ba659 100644
--- a/packages/sx.js/test/unit/clients/starknet/starknet-sig/__snapshots__/index.test.ts.snap
+++ b/packages/sx.js/test/unit/clients/starknet/starknet-sig/__snapshots__/index.test.ts.snap
@@ -21,6 +21,12 @@ exports[`StarknetSig > should create propose envelope 1`] = `
   },
   "signatureData": {
     "address": "0x07d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
+    "domain": {
+      "chainId": "0x534e5f5345504f4c4941",
+      "name": "sx-starknet",
+      "verifyingContract": "0x213bb25044b189ccfda9882999dba32e011781dc11b2a6efa2b3d232824378e",
+      "version": "0.1.0",
+    },
     "message": {
       "author": "0x7d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
       "executionStrategy": {
@@ -44,6 +50,62 @@ exports[`StarknetSig > should create propose envelope 1`] = `
       "0x7faa90924da8c43edec0109655f719aa06d597a97286d2a4844bc072bffdf3f",
       "0x2cd44c86f6f223ca5080c6f6092b93a9c932825b1b6a65e0515debcb22742ea",
     ],
+    "types": {
+      "Propose": [
+        {
+          "name": "space",
+          "type": "ContractAddress",
+        },
+        {
+          "name": "author",
+          "type": "ContractAddress",
+        },
+        {
+          "name": "metadataUri",
+          "type": "felt*",
+        },
+        {
+          "name": "executionStrategy",
+          "type": "Strategy",
+        },
+        {
+          "name": "userProposalValidationParams",
+          "type": "felt*",
+        },
+        {
+          "name": "salt",
+          "type": "felt252",
+        },
+      ],
+      "StarkNetDomain": [
+        {
+          "name": "name",
+          "type": "felt252",
+        },
+        {
+          "name": "version",
+          "type": "felt252",
+        },
+        {
+          "name": "chainId",
+          "type": "felt252",
+        },
+        {
+          "name": "verifyingContract",
+          "type": "ContractAddress",
+        },
+      ],
+      "Strategy": [
+        {
+          "name": "address",
+          "type": "felt252",
+        },
+        {
+          "name": "params",
+          "type": "felt*",
+        },
+      ],
+    },
   },
 }
 `;
@@ -64,6 +126,12 @@ exports[`StarknetSig > should create update proposal envelope 1`] = `
   },
   "signatureData": {
     "address": "0x07d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
+    "domain": {
+      "chainId": "0x534e5f5345504f4c4941",
+      "name": "sx-starknet",
+      "verifyingContract": "0x213bb25044b189ccfda9882999dba32e011781dc11b2a6efa2b3d232824378e",
+      "version": "0.1.0",
+    },
     "message": {
       "author": "0x7d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
       "executionStrategy": {
@@ -88,6 +156,72 @@ exports[`StarknetSig > should create update proposal envelope 1`] = `
       "0x66f624dd2dcbc81ab4f6aea08db63b902a72517e461a4fbe30c27cd5b775e9b",
       "0x28993ed0dd85c5ac3b5017978f4251b014bc7bd375a02048c1e032997f75700",
     ],
+    "types": {
+      "StarkNetDomain": [
+        {
+          "name": "name",
+          "type": "felt252",
+        },
+        {
+          "name": "version",
+          "type": "felt252",
+        },
+        {
+          "name": "chainId",
+          "type": "felt252",
+        },
+        {
+          "name": "verifyingContract",
+          "type": "ContractAddress",
+        },
+      ],
+      "Strategy": [
+        {
+          "name": "address",
+          "type": "felt252",
+        },
+        {
+          "name": "params",
+          "type": "felt*",
+        },
+      ],
+      "UpdateProposal": [
+        {
+          "name": "space",
+          "type": "ContractAddress",
+        },
+        {
+          "name": "author",
+          "type": "ContractAddress",
+        },
+        {
+          "name": "proposalId",
+          "type": "u256",
+        },
+        {
+          "name": "executionStrategy",
+          "type": "Strategy",
+        },
+        {
+          "name": "metadataUri",
+          "type": "felt*",
+        },
+        {
+          "name": "salt",
+          "type": "felt252",
+        },
+      ],
+      "u256": [
+        {
+          "name": "low",
+          "type": "felt252",
+        },
+        {
+          "name": "high",
+          "type": "felt252",
+        },
+      ],
+    },
   },
 }
 `;
@@ -108,6 +242,12 @@ exports[`StarknetSig > should create vote envelope 1`] = `
   },
   "signatureData": {
     "address": "0x07d2f37b75a5e779f7da01c22acee1b66c39e8ba470ee5448f05e1462afcedb4",
+    "domain": {
+      "chainId": "0x534e5f5345504f4c4941",
+      "name": "sx-starknet",
+      "verifyingContract": "0x213bb25044b189ccfda9882999dba32e011781dc11b2a6efa2b3d232824378e",
+      "version": "0.1.0",
+    },
     "message": {
       "choice": "0x1",
       "metadataUri": [],
@@ -124,6 +264,72 @@ exports[`StarknetSig > should create vote envelope 1`] = `
       "0x155b32bbfbb261e29f97dfae43b5423f1a205eb1ef26680e7edf1758453d63a",
       "0x5da6c03b40c281be8686afd2d985db93fc3fc27e4c8a2856ba7c635ebf1b2d6",
     ],
+    "types": {
+      "IndexedStrategy": [
+        {
+          "name": "index",
+          "type": "felt252",
+        },
+        {
+          "name": "params",
+          "type": "felt*",
+        },
+      ],
+      "StarkNetDomain": [
+        {
+          "name": "name",
+          "type": "felt252",
+        },
+        {
+          "name": "version",
+          "type": "felt252",
+        },
+        {
+          "name": "chainId",
+          "type": "felt252",
+        },
+        {
+          "name": "verifyingContract",
+          "type": "ContractAddress",
+        },
+      ],
+      "Vote": [
+        {
+          "name": "space",
+          "type": "ContractAddress",
+        },
+        {
+          "name": "voter",
+          "type": "ContractAddress",
+        },
+        {
+          "name": "proposalId",
+          "type": "u256",
+        },
+        {
+          "name": "choice",
+          "type": "felt252",
+        },
+        {
+          "name": "userVotingStrategies",
+          "type": "IndexedStrategy*",
+        },
+        {
+          "name": "metadataUri",
+          "type": "felt*",
+        },
+      ],
+      "u256": [
+        {
+          "name": "low",
+          "type": "felt252",
+        },
+        {
+          "name": "high",
+          "type": "felt252",
+        },
+      ],
+    },
   },
 }
 `;

From 4aa3468f5bc61be69ed877bf25d6b9fd2ea6aaf6 Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Mon, 22 Jul 2024 13:28:00 +0400
Subject: [PATCH 18/29] Update apps/ui/src/composables/useActions.ts

Co-authored-by: Chaitanya <yourchaitu@gmail.com>
---
 apps/ui/src/composables/useActions.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
index 37275443c..83fd05e6a 100644
--- a/apps/ui/src/composables/useActions.ts
+++ b/apps/ui/src/composables/useActions.ts
@@ -18,14 +18,13 @@ import { starknetNetworks } from '@snapshot-labs/sx';
 import { STARKNET_CONNECTORS } from '@/networks/common/constants';
 
 const offchainNetworkId = offchainNetworks.filter(network => enabledNetworks.includes(network))[0];
+const offchainToStarknetIds: Record<string, NetworkID> = {
+  's': 'sn',
+  's-tn': 'sn-sep',
+};
+
 const starknetNetworkId = (Object.keys(starknetNetworks) as NetworkID[])
-  .filter(network => enabledNetworks.includes(network))
-  .find(id => {
-    return (
-      (offchainNetworkId === 's' && id === 'sn') ||
-      (offchainNetworkId === 's-tn' && id === 'sn-sep')
-    );
-  }) as NetworkID;
+  .find(networkId => enabledNetworks.includes(networkId) && networkId === offchainToStarknetIds[offchainNetworkId]) as NetworkID;
 
 export function useActions() {
   const { mixpanel } = useMixpanel();

From 4f3fa50ed97b3b1054b3f324ca48bff75c91d31f Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Wed, 24 Jul 2024 12:09:50 +0900
Subject: [PATCH 19/29] fix: revert unrelated change

---
 apps/ui/src/composables/useAccount.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/ui/src/composables/useAccount.ts b/apps/ui/src/composables/useAccount.ts
index e61a9656e..bf120944c 100644
--- a/apps/ui/src/composables/useAccount.ts
+++ b/apps/ui/src/composables/useAccount.ts
@@ -21,8 +21,6 @@ export function useAccount() {
     const account = web3.value.account;
     if (!account) return;
 
-    if (web3.value.type === 'argentx' && offchainNetworks.includes(networkId)) return;
-
     const network = getNetwork(networkId);
     const userVotes = await network.api.loadUserVotes(spaceIds, account);
 

From e3b6e50d8589175b623a55b5dbbb9751d83e51b0 Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Wed, 24 Jul 2024 12:15:26 +0900
Subject: [PATCH 20/29] chore: removed unused import

---
 apps/ui/src/composables/useAccount.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ui/src/composables/useAccount.ts b/apps/ui/src/composables/useAccount.ts
index bf120944c..8052690b5 100644
--- a/apps/ui/src/composables/useAccount.ts
+++ b/apps/ui/src/composables/useAccount.ts
@@ -1,4 +1,4 @@
-import { getNetwork, offchainNetworks } from '@/networks';
+import { getNetwork } from '@/networks';
 import type { NetworkID, Proposal, Vote } from '@/types';
 
 const { web3 } = useWeb3();

From 222ca08d5c53e7db042b6a379bad87ce6e3caaeb Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Wed, 24 Jul 2024 12:17:17 +0900
Subject: [PATCH 21/29] chore: add comments about confusing extra starknet
 params on evm envelope

---
 packages/sx.js/src/clients/offchain/ethereum-sig/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/sx.js/src/clients/offchain/ethereum-sig/index.ts b/packages/sx.js/src/clients/offchain/ethereum-sig/index.ts
index 61d71b921..8091b29db 100644
--- a/packages/sx.js/src/clients/offchain/ethereum-sig/index.ts
+++ b/packages/sx.js/src/clients/offchain/ethereum-sig/index.ts
@@ -119,6 +119,7 @@ export class EthereumSig {
       }
     };
 
+    // primaryType needs to be attached when sending starknet-sig generated payload
     if (primaryType) payload.data.primaryType = primaryType;
 
     const body = {

From 2db20c3a42284a2d271950402bf0ad3741658d98 Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Wed, 24 Jul 2024 12:18:57 +0900
Subject: [PATCH 22/29] chore: fix import order

---
 apps/ui/src/composables/useActions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
index 86cd9ac8c..2ef8c9f99 100644
--- a/apps/ui/src/composables/useActions.ts
+++ b/apps/ui/src/composables/useActions.ts
@@ -1,3 +1,4 @@
+import { starknetNetworks } from '@snapshot-labs/sx';
 import { getInstance } from '@snapshot-labs/lock/plugins/vue3';
 import {
   enabledNetworks,
@@ -19,8 +20,7 @@ import type {
   VoteType,
   User
 } from '@/types';
-import type { Connector, StrategyConfig } from '@/networks/types';
-import { starknetNetworks } from '@snapshot-labs/sx';
+import { Connector, StrategyConfig } from '@/networks/types';
 import { STARKNET_CONNECTORS } from '@/networks/common/constants';
 
 const offchainNetworkId = offchainNetworks.filter(network => enabledNetworks.includes(network))[0];

From 2c5c658cfb5d090de3cd86d175025355c6e39f1d Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Wed, 24 Jul 2024 12:45:34 +0900
Subject: [PATCH 23/29] fix: sign alias with first available starknet network

---
 apps/ui/src/composables/useActions.ts | 22 +++++-----------------
 apps/ui/src/networks/index.ts         |  1 +
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
index 2ef8c9f99..6eb788226 100644
--- a/apps/ui/src/composables/useActions.ts
+++ b/apps/ui/src/composables/useActions.ts
@@ -1,11 +1,10 @@
-import { starknetNetworks } from '@snapshot-labs/sx';
 import { getInstance } from '@snapshot-labs/lock/plugins/vue3';
 import {
-  enabledNetworks,
   getNetwork,
   getReadWriteNetwork,
-  metadataNetwork,
-  offchainNetworks
+  starknetNetworks,
+  enabledNetworks,
+  metadataNetwork
 } from '@/networks';
 import { registerTransaction } from '@/helpers/mana';
 import { convertToMetaTransactions } from '@/helpers/transactions';
@@ -23,17 +22,6 @@ import type {
 import { Connector, StrategyConfig } from '@/networks/types';
 import { STARKNET_CONNECTORS } from '@/networks/common/constants';
 
-const offchainNetworkId = offchainNetworks.filter(network => enabledNetworks.includes(network))[0];
-const offchainToStarknetIds: Record<string, NetworkID> = {
-  s: 'sn',
-  's-tn': 'sn-sep'
-};
-
-const starknetNetworkId = (Object.keys(starknetNetworks) as NetworkID[]).find(
-  networkId =>
-    enabledNetworks.includes(networkId) && networkId === offchainToStarknetIds[offchainNetworkId]
-) as NetworkID;
-
 export function useActions() {
   const { mixpanel } = useMixpanel();
   const uiStore = useUiStore();
@@ -137,8 +125,8 @@ export function useActions() {
   async function getAliasSigner() {
     const network = getNetwork(
       STARKNET_CONNECTORS.includes(web3.value.type as Connector)
-        ? starknetNetworkId
-        : offchainNetworkId
+        ? (starknetNetworks.find(id => enabledNetworks.includes(id)) as NetworkID)
+        : metadataNetwork
     );
 
     return alias.getAliasWallet(address =>
diff --git a/apps/ui/src/networks/index.ts b/apps/ui/src/networks/index.ts
index 274d0fb16..0ba912ba3 100644
--- a/apps/ui/src/networks/index.ts
+++ b/apps/ui/src/networks/index.ts
@@ -21,6 +21,7 @@ export const enabledNetworks: NetworkID[] = import.meta.env.VITE_ENABLED_NETWORK
 
 export const evmNetworks: NetworkID[] = ['eth', 'matic', 'arb1', 'oeth', 'sep', 'linea-testnet'];
 export const offchainNetworks: NetworkID[] = ['s', 's-tn'];
+export const starknetNetworks: NetworkID[] = ['sn', 'sn-sep'];
 // This network is used for aliases/follows/profiles/explore page.
 export const metadataNetwork: NetworkID = import.meta.env.VITE_METADATA_NETWORK || 's';
 

From a8a49ec2aa9aedc2ce2c1a5518f729332b113a76 Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Wed, 24 Jul 2024 23:35:05 +0900
Subject: [PATCH 24/29] chore: lint fix

---
 apps/ui/src/stores/followedSpaces.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/ui/src/stores/followedSpaces.ts b/apps/ui/src/stores/followedSpaces.ts
index 58c7feeec..75162c23d 100644
--- a/apps/ui/src/stores/followedSpaces.ts
+++ b/apps/ui/src/stores/followedSpaces.ts
@@ -126,7 +126,11 @@ export const useFollowedSpacesStore = defineStore('followedSpaces', () => {
   }
 
   watch(
-    [() => web3.value.account, () => web3.value.authLoading, () => authInitiated.value],
+    [
+      () => web3.value.account,
+      () => web3.value.authLoading,
+      () => authInitiated.value
+    ],
     async ([web3, authLoading, authInitiated]) => {
       if (!authInitiated || authLoading) return;
 

From f9f3e91d58ca77245934f5bdd9a75851d651f29a Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Wed, 24 Jul 2024 23:40:58 +0900
Subject: [PATCH 25/29] chore: add changesets

---
 .changeset/calm-deers-sort.md    | 5 +++++
 .changeset/funny-candles-glow.md | 5 +++++
 .changeset/red-mayflies-yell.md  | 5 +++++
 .changeset/wild-news-shave.md    | 5 +++++
 4 files changed, 20 insertions(+)
 create mode 100644 .changeset/calm-deers-sort.md
 create mode 100644 .changeset/funny-candles-glow.md
 create mode 100644 .changeset/red-mayflies-yell.md
 create mode 100644 .changeset/wild-news-shave.md

diff --git a/.changeset/calm-deers-sort.md b/.changeset/calm-deers-sort.md
new file mode 100644
index 000000000..ff80323b9
--- /dev/null
+++ b/.changeset/calm-deers-sort.md
@@ -0,0 +1,5 @@
+---
+"@snapshot-labs/sx": patch
+---
+
+add domain and types to starknet/starknet-sig envelope
diff --git a/.changeset/funny-candles-glow.md b/.changeset/funny-candles-glow.md
new file mode 100644
index 000000000..02f724193
--- /dev/null
+++ b/.changeset/funny-candles-glow.md
@@ -0,0 +1,5 @@
+---
+"@snapshot-labs/sx": patch
+---
+
+always return padded addresses in starknet/starknet-sig envelope
diff --git a/.changeset/red-mayflies-yell.md b/.changeset/red-mayflies-yell.md
new file mode 100644
index 000000000..19526d86c
--- /dev/null
+++ b/.changeset/red-mayflies-yell.md
@@ -0,0 +1,5 @@
+---
+"@snapshot-labs/sx": patch
+---
+
+add support for sending starknet signed message to offchain/ethereum-sig
diff --git a/.changeset/wild-news-shave.md b/.changeset/wild-news-shave.md
new file mode 100644
index 000000000..a229f245e
--- /dev/null
+++ b/.changeset/wild-news-shave.md
@@ -0,0 +1,5 @@
+---
+"@snapshot-labs/sx": patch
+---
+
+add setAlias to starknet/starknet-sig

From f928679825f19a4782b9369f9557b23e9d50861a Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Sat, 27 Jul 2024 21:20:33 +0900
Subject: [PATCH 26/29] revert: revert back ot use correct starknet chaind ID

---
 apps/ui/src/composables/useActions.ts | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
index b8ba40837..867e4edf8 100644
--- a/apps/ui/src/composables/useActions.ts
+++ b/apps/ui/src/composables/useActions.ts
@@ -6,6 +6,7 @@ import {
   getNetwork,
   getReadWriteNetwork,
   metadataNetwork,
+  offchainNetworks,
   starknetNetworks
 } from '@/networks';
 import { STARKNET_CONNECTORS } from '@/networks/common/constants';
@@ -23,6 +24,20 @@ import {
   VoteType
 } from '@/types';
 
+const offchainNetworkId = offchainNetworks.filter(network =>
+  enabledNetworks.includes(network)
+)[0];
+const offchainToStarknetIds: Record<string, NetworkID> = {
+  s: 'sn',
+  's-tn': 'sn-sep'
+};
+
+const starknetNetworkId = (Object.keys(starknetNetworks) as NetworkID[]).find(
+  networkId =>
+    enabledNetworks.includes(networkId) &&
+    networkId === offchainToStarknetIds[offchainNetworkId]
+) as NetworkID;
+
 export function useActions() {
   const { mixpanel } = useMixpanel();
   const uiStore = useUiStore();
@@ -135,10 +150,8 @@ export function useActions() {
   async function getAliasSigner() {
     const network = getNetwork(
       STARKNET_CONNECTORS.includes(web3.value.type as Connector)
-        ? (starknetNetworks.find(id =>
-            enabledNetworks.includes(id)
-          ) as NetworkID)
-        : metadataNetwork
+        ? starknetNetworkId
+        : offchainNetworkId
     );
 
     return alias.getAliasWallet(address =>

From 313f2cd88f91ab894f00b19c63fbec86af6f1bef Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Sat, 27 Jul 2024 21:28:36 +0900
Subject: [PATCH 27/29] fix: finish revert

---
 apps/ui/src/composables/useActions.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
index 867e4edf8..1359335fe 100644
--- a/apps/ui/src/composables/useActions.ts
+++ b/apps/ui/src/composables/useActions.ts
@@ -6,7 +6,6 @@ import {
   getNetwork,
   getReadWriteNetwork,
   metadataNetwork,
-  offchainNetworks,
   starknetNetworks
 } from '@/networks';
 import { STARKNET_CONNECTORS } from '@/networks/common/constants';
@@ -24,18 +23,15 @@ import {
   VoteType
 } from '@/types';
 
-const offchainNetworkId = offchainNetworks.filter(network =>
-  enabledNetworks.includes(network)
-)[0];
 const offchainToStarknetIds: Record<string, NetworkID> = {
   s: 'sn',
   's-tn': 'sn-sep'
 };
 
-const starknetNetworkId = (Object.keys(starknetNetworks) as NetworkID[]).find(
+const starknetNetworkId = starknetNetworks.find(
   networkId =>
     enabledNetworks.includes(networkId) &&
-    networkId === offchainToStarknetIds[offchainNetworkId]
+    networkId === offchainToStarknetIds[metadataNetwork]
 ) as NetworkID;
 
 export function useActions() {

From 01faa1486d573ad64dadec7c4b76495a8a301fed Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Sat, 27 Jul 2024 21:32:41 +0900
Subject: [PATCH 28/29] fix: fix leftover from merge

---
 apps/ui/src/composables/useActions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
index 1359335fe..63ffeb12a 100644
--- a/apps/ui/src/composables/useActions.ts
+++ b/apps/ui/src/composables/useActions.ts
@@ -147,7 +147,7 @@ export function useActions() {
     const network = getNetwork(
       STARKNET_CONNECTORS.includes(web3.value.type as Connector)
         ? starknetNetworkId
-        : offchainNetworkId
+        : metadataNetwork
     );
 
     return alias.getAliasWallet(address =>

From f47e9dc4162a144e08833e23e8dd10597e977742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Mon, 29 Jul 2024 12:32:45 +0200
Subject: [PATCH 29/29] refactor: simplify starknetNetworkId lookup

---
 apps/ui/src/composables/useActions.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
index 63ffeb12a..891a1e272 100644
--- a/apps/ui/src/composables/useActions.ts
+++ b/apps/ui/src/composables/useActions.ts
@@ -28,11 +28,7 @@ const offchainToStarknetIds: Record<string, NetworkID> = {
   's-tn': 'sn-sep'
 };
 
-const starknetNetworkId = starknetNetworks.find(
-  networkId =>
-    enabledNetworks.includes(networkId) &&
-    networkId === offchainToStarknetIds[metadataNetwork]
-) as NetworkID;
+const starknetNetworkId = offchainToStarknetIds[metadataNetwork];
 
 export function useActions() {
   const { mixpanel } = useMixpanel();