Skip to content

Commit 197f7d2

Browse files
author
ignaciosantise
committed
chore: remove smart accounts unused logic
1 parent 09fb62b commit 197f7d2

File tree

4 files changed

+3
-200
lines changed

4 files changed

+3
-200
lines changed

‎packages/email/src/W3mFrameConstants.ts

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export const W3mFrameConstants = {
2-
SECURE_SITE_SDK: 'https://secure-mobile.walletconnect.com/mobile-sdk',
3-
SECURE_SITE_ORIGIN: 'https://secure.walletconnect.com',
2+
SECURE_SITE_SDK: 'http://localhost:3010/mobile-sdk',
3+
SECURE_SITE_ORIGIN: 'http://localhost:3010',
44
SECURE_SITE_DASHBOARD: `https://secure.walletconnect.com/dashboard`,
55
SECURE_SITE_ICON: `https://secure.walletconnect.com/images/favicon.png`,
66
APP_EVENT_KEY: '@w3m-app/',
@@ -13,7 +13,6 @@ export const W3mFrameConstants = {
1313
LAST_USED_CHAIN_KEY: 'LAST_USED_CHAIN_KEY',
1414
LAST_EMAIL_LOGIN_TIME: 'LAST_EMAIL_LOGIN_TIME',
1515
EMAIL: 'EMAIL',
16-
PREFERRED_ACCOUNT_TYPE: 'PREFERRED_ACCOUNT_TYPE',
1716

1817
FRAME_MESSAGES_HANDLER: `
1918
const iframe = document.getElementById("frame-mobile-sdk");
@@ -39,9 +38,6 @@ export const W3mFrameConstants = {
3938
APP_AWAIT_UPDATE_EMAIL: '@w3m-app/AWAIT_UPDATE_EMAIL',
4039
APP_SYNC_THEME: '@w3m-app/SYNC_THEME',
4140
APP_SYNC_DAPP_DATA: '@w3m-app/SYNC_DAPP_DATA',
42-
APP_GET_SMART_ACCOUNT_ENABLED_NETWORKS: '@w3m-app/GET_SMART_ACCOUNT_ENABLED_NETWORKS',
43-
APP_INIT_SMART_ACCOUNT: '@w3m-app/INIT_SMART_ACCOUNT',
44-
APP_SET_PREFERRED_ACCOUNT: '@w3m-app/SET_PREFERRED_ACCOUNT',
4541

4642
FRAME_SWITCH_NETWORK_ERROR: '@w3m-frame/SWITCH_NETWORK_ERROR',
4743
FRAME_SWITCH_NETWORK_SUCCESS: '@w3m-frame/SWITCH_NETWORK_SUCCESS',
@@ -71,15 +67,7 @@ export const W3mFrameConstants = {
7167
FRAME_SYNC_THEME_SUCCESS: '@w3m-frame/SYNC_THEME_SUCCESS',
7268
FRAME_SYNC_THEME_ERROR: '@w3m-frame/SYNC_THEME_ERROR',
7369
FRAME_SYNC_DAPP_DATA_SUCCESS: '@w3m-frame/SYNC_DAPP_DATA_SUCCESS',
74-
FRAME_SYNC_DAPP_DATA_ERROR: '@w3m-frame/SYNC_DAPP_DATA_ERROR',
75-
FRAME_GET_SMART_ACCOUNT_ENABLED_NETWORKS_SUCCESS:
76-
'@w3m-frame/GET_SMART_ACCOUNT_ENABLED_NETWORKS_SUCCESS',
77-
FRAME_GET_SMART_ACCOUNT_ENABLED_NETWORKS_ERROR:
78-
'@w3m-frame/GET_SMART_ACCOUNT_ENABLED_NETWORKS_ERROR',
79-
FRAME_INIT_SMART_ACCOUNT_SUCCESS: '@w3m-frame/INIT_SMART_ACCOUNT_SUCCESS',
80-
FRAME_INIT_SMART_ACCOUNT_ERROR: '@w3m-frame/INIT_SMART_ACCOUNT_ERROR',
81-
FRAME_SET_PREFERRED_ACCOUNT_SUCCESS: '@w3m-frame/SET_PREFERRED_ACCOUNT_SUCCESS',
82-
FRAME_SET_PREFERRED_ACCOUNT_ERROR: '@w3m-frame/SET_PREFERRED_ACCOUNT_ERROR'
70+
FRAME_SYNC_DAPP_DATA_ERROR: '@w3m-frame/SYNC_DAPP_DATA_ERROR'
8371
} as const;
8472

8573
export const W3mFrameRpcConstants = {

‎packages/email/src/W3mFrameProvider.ts

Lines changed: 0 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ type UpdateEmailSecondaryOtpResolver = Resolver<
2424
>;
2525
type SyncThemeResolver = Resolver<undefined>;
2626
type SyncDappDataResolver = Resolver<undefined>;
27-
type SmartAccountEnabledNetworksResolver = Resolver<
28-
W3mFrameTypes.Responses['FrameGetSmartAccountEnabledNetworksResponse']
29-
>;
30-
type InitSmartAccountResolver = Resolver<W3mFrameTypes.Responses['FrameInitSmartAccountResponse']>;
31-
type SetPreferredAccountResolver = Resolver<undefined>;
3227

3328
type Metadata = {
3429
name: string;
@@ -84,12 +79,6 @@ export class W3mFrameProvider {
8479

8580
private syncDappDataResolver: SyncDappDataResolver = undefined;
8681

87-
private smartAccountEnabledNetworksResolver: SmartAccountEnabledNetworksResolver = undefined;
88-
89-
private initSmartAccountResolver: InitSmartAccountResolver = undefined;
90-
91-
private setPreferredAccountResolver: SetPreferredAccountResolver = undefined;
92-
9382
public constructor(projectId: string, metadata: Metadata) {
9483
this.webviewLoadPromise = new Promise((resolve, reject) => {
9584
this.webviewLoadPromiseResolver = { resolve, reject };
@@ -168,19 +157,6 @@ export class W3mFrameProvider {
168157
return this.onSyncDappDataSuccess();
169158
case W3mFrameConstants.FRAME_SYNC_DAPP_DATA_ERROR:
170159
return this.onSyncDappDataError(event);
171-
case W3mFrameConstants.FRAME_GET_SMART_ACCOUNT_ENABLED_NETWORKS_SUCCESS:
172-
return this.onSmartAccountEnabledNetworksSuccess(event);
173-
case W3mFrameConstants.FRAME_GET_SMART_ACCOUNT_ENABLED_NETWORKS_ERROR:
174-
return this.onSmartAccountEnabledNetworksError(event);
175-
case W3mFrameConstants.FRAME_INIT_SMART_ACCOUNT_SUCCESS:
176-
return this.onInitSmartAccountSuccess(event);
177-
case W3mFrameConstants.FRAME_INIT_SMART_ACCOUNT_ERROR:
178-
return this.onInitSmartAccountError(event);
179-
case W3mFrameConstants.FRAME_SET_PREFERRED_ACCOUNT_SUCCESS:
180-
return this.onPreferSmartAccountSuccess(event);
181-
case W3mFrameConstants.FRAME_SET_PREFERRED_ACCOUNT_ERROR:
182-
return this.onPreferSmartAccountError();
183-
184160
default:
185161
return null;
186162
}
@@ -325,42 +301,6 @@ export class W3mFrameProvider {
325301
});
326302
}
327303

328-
public async getSmartAccountEnabledNetworks() {
329-
await this.webviewLoadPromise;
330-
this.postAppEvent({
331-
type: W3mFrameConstants.APP_GET_SMART_ACCOUNT_ENABLED_NETWORKS
332-
});
333-
334-
return new Promise<W3mFrameTypes.Responses['FrameGetSmartAccountEnabledNetworksResponse']>(
335-
(resolve, reject) => {
336-
this.smartAccountEnabledNetworksResolver = { resolve, reject };
337-
}
338-
);
339-
}
340-
341-
public async initSmartAccount() {
342-
await this.webviewLoadPromise;
343-
this.postAppEvent({ type: W3mFrameConstants.APP_INIT_SMART_ACCOUNT });
344-
345-
return new Promise<W3mFrameTypes.Responses['FrameInitSmartAccountResponse']>(
346-
(resolve, reject) => {
347-
this.initSmartAccountResolver = { resolve, reject };
348-
}
349-
);
350-
}
351-
352-
public async setPreferredAccount(type: 'eoa' | 'smartAccount') {
353-
await this.webviewLoadPromise;
354-
this.postAppEvent({
355-
type: W3mFrameConstants.APP_SET_PREFERRED_ACCOUNT,
356-
payload: { type }
357-
});
358-
359-
return new Promise((resolve, reject) => {
360-
this.setPreferredAccountResolver = { resolve, reject };
361-
});
362-
}
363-
364304
// -- Provider Methods ------------------------------------------------
365305
public async connect(payload?: W3mFrameTypes.Requests['AppGetUserRequest']) {
366306
const lastUsedChain = await this.getLastUsedChainId();
@@ -451,19 +391,6 @@ export class W3mFrameProvider {
451391
});
452392
}
453393

454-
public onInitSmartAccount(
455-
event: W3mFrameTypes.FrameEvent,
456-
callback: (isDeployed: boolean) => void
457-
) {
458-
this.onFrameEvent(event, frameEvent => {
459-
if (frameEvent.type === W3mFrameConstants.FRAME_INIT_SMART_ACCOUNT_SUCCESS) {
460-
callback(frameEvent.payload.isDeployed);
461-
} else if (frameEvent.type === W3mFrameConstants.FRAME_INIT_SMART_ACCOUNT_ERROR) {
462-
callback(false);
463-
}
464-
});
465-
}
466-
467394
// -- Promise Handlers ------------------------------------------------
468395
private onConnectEmailSuccess(
469396
event: Extract<W3mFrameTypes.FrameEvent, { type: '@w3m-frame/CONNECT_EMAIL_SUCCESS' }>
@@ -648,47 +575,6 @@ export class W3mFrameProvider {
648575
this.syncDappDataResolver?.reject(event.payload.message);
649576
}
650577

651-
private onSmartAccountEnabledNetworksSuccess(
652-
event: Extract<
653-
W3mFrameTypes.FrameEvent,
654-
{ type: '@w3m-frame/GET_SMART_ACCOUNT_ENABLED_NETWORKS_SUCCESS' }
655-
>
656-
) {
657-
this.smartAccountEnabledNetworksResolver?.resolve(event.payload);
658-
}
659-
660-
private onSmartAccountEnabledNetworksError(
661-
event: Extract<
662-
W3mFrameTypes.FrameEvent,
663-
{ type: '@w3m-frame/GET_SMART_ACCOUNT_ENABLED_NETWORKS_ERROR' }
664-
>
665-
) {
666-
this.smartAccountEnabledNetworksResolver?.reject(event.payload.message);
667-
}
668-
669-
private onInitSmartAccountSuccess(
670-
event: Extract<W3mFrameTypes.FrameEvent, { type: '@w3m-frame/INIT_SMART_ACCOUNT_SUCCESS' }>
671-
) {
672-
this.initSmartAccountResolver?.resolve(event.payload);
673-
}
674-
675-
private onInitSmartAccountError(
676-
event: Extract<W3mFrameTypes.FrameEvent, { type: '@w3m-frame/INIT_SMART_ACCOUNT_ERROR' }>
677-
) {
678-
this.initSmartAccountResolver?.reject(event.payload.message);
679-
}
680-
681-
private onPreferSmartAccountSuccess(
682-
event: Extract<W3mFrameTypes.FrameEvent, { type: '@w3m-frame/SET_PREFERRED_ACCOUNT_SUCCESS' }>
683-
) {
684-
this.persistPreferredAccount(event.payload.type as 'eoa' | 'smartAccount');
685-
this.setPreferredAccountResolver?.resolve(undefined);
686-
}
687-
688-
private onPreferSmartAccountError() {
689-
this.setPreferredAccountResolver?.reject();
690-
}
691-
692578
// -- Private Methods -------------------------------------------------
693579
private setNewLastEmailLoginTime() {
694580
W3mFrameStorage.set(W3mFrameConstants.LAST_EMAIL_LOGIN_TIME, Date.now().toString());
@@ -721,10 +607,6 @@ export class W3mFrameProvider {
721607
return undefined;
722608
}
723609

724-
private persistPreferredAccount(type: 'eoa' | 'smartAccount') {
725-
W3mFrameStorage.set(W3mFrameConstants.PREFERRED_ACCOUNT_TYPE, type);
726-
}
727-
728610
private onFrameEvent(
729611
event: W3mFrameTypes.FrameEvent,
730612
callback: (event: W3mFrameTypes.FrameEvent) => void

‎packages/email/src/W3mFrameSchema.ts

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,6 @@ export const FrameIsConnectedResponse = z.object({ isConnected: z.boolean() });
7373
export const FrameGetChainIdResponse = z.object({ chainId: z.number() });
7474
export const FrameSwitchNetworkResponse = z.object({ chainId: z.number() });
7575
export const FrameUpdateEmailSecondaryOtpResolver = z.object({ newEmail: z.string().email() });
76-
export const FrameGetSmartAccountEnabledNetworksResponse = z.object({
77-
smartAccountEnabledNetworks: z.array(z.number())
78-
});
79-
export const FrameInitSmartAccountResponse = z.object({
80-
address: z.string(),
81-
isDeployed: z.boolean()
82-
});
83-
export const FrameSetPreferredAccountResponse = z.object({ type: z.string() });
8476

8577
export const RpcResponse = z.any();
8678

@@ -285,14 +277,6 @@ export const W3mFrameSchema = {
285277

286278
.or(z.object({ type: zType('APP_GET_CHAIN_ID') }))
287279

288-
.or(z.object({ type: zType('APP_GET_SMART_ACCOUNT_ENABLED_NETWORKS') }))
289-
290-
.or(z.object({ type: zType('APP_INIT_SMART_ACCOUNT') }))
291-
292-
.or(
293-
z.object({ type: zType('APP_SET_PREFERRED_ACCOUNT'), payload: AppSetPreferredAccountRequest })
294-
)
295-
296280
.or(
297281
z.object({
298282
type: zType('APP_RPC_REQUEST'),
@@ -482,49 +466,4 @@ export const W3mFrameSchema = {
482466
)
483467

484468
.or(z.object({ type: zType('FRAME_SYNC_DAPP_DATA_SUCCESS'), origin: z.string() }))
485-
486-
.or(
487-
z.object({
488-
type: zType('FRAME_GET_SMART_ACCOUNT_ENABLED_NETWORKS_SUCCESS'),
489-
payload: FrameGetSmartAccountEnabledNetworksResponse,
490-
origin: z.string()
491-
})
492-
)
493-
494-
.or(
495-
z.object({
496-
type: zType('FRAME_GET_SMART_ACCOUNT_ENABLED_NETWORKS_ERROR'),
497-
payload: zError,
498-
origin: z.string()
499-
})
500-
)
501-
502-
.or(
503-
z.object({
504-
type: zType('FRAME_INIT_SMART_ACCOUNT_SUCCESS'),
505-
payload: FrameInitSmartAccountResponse,
506-
origin: z.string()
507-
})
508-
)
509-
.or(
510-
z.object({
511-
type: zType('FRAME_INIT_SMART_ACCOUNT_ERROR'),
512-
payload: zError,
513-
origin: z.string()
514-
})
515-
)
516-
.or(
517-
z.object({
518-
type: zType('FRAME_SET_PREFERRED_ACCOUNT_SUCCESS'),
519-
payload: FrameSetPreferredAccountResponse,
520-
origin: z.string()
521-
})
522-
)
523-
.or(
524-
z.object({
525-
type: zType('FRAME_SET_PREFERRED_ACCOUNT_ERROR'),
526-
payload: zError,
527-
origin: z.string()
528-
})
529-
)
530469
};

‎packages/email/src/W3mFrameTypes.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ import {
5555
RpcEthChainId,
5656
FrameSwitchNetworkResponse,
5757
AppSyncDappDataRequest,
58-
FrameGetSmartAccountEnabledNetworksResponse,
59-
FrameInitSmartAccountResponse,
6058
FrameUpdateEmailResponse
6159
} from './W3mFrameSchema';
6260

@@ -84,10 +82,6 @@ export namespace W3mFrameTypes {
8482
FrameIsConnectedResponse: z.infer<typeof FrameIsConnectedResponse>;
8583
FrameUpdateEmailSecondaryOtpResolver: z.infer<typeof FrameUpdateEmailSecondaryOtpResolver>;
8684
FrameSwitchNetworkResponse: z.infer<typeof FrameSwitchNetworkResponse>;
87-
FrameGetSmartAccountEnabledNetworksResponse: z.infer<
88-
typeof FrameGetSmartAccountEnabledNetworksResponse
89-
>;
90-
FrameInitSmartAccountResponse: z.infer<typeof FrameInitSmartAccountResponse>;
9185
FrameUpdateEmailResponse: z.infer<typeof FrameUpdateEmailResponse>;
9286
}
9387

0 commit comments

Comments
 (0)