Skip to content

fix: add type annotations to connectors #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add type annotations to connectors #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/lib/connectors/dedicatedWalletConnector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export interface DedicatedWalletConnectorParams extends MagicConnectorParams {
options: DedicatedWalletOptions;
}

export function dedicatedWalletConnector({ chains, options }: DedicatedWalletConnectorParams) {
export function dedicatedWalletConnector({ chains, options }: DedicatedWalletConnectorParams): any {
let { id, name, type, isModalOpen, getAccount, getMagicSDK, getProvider, onAccountsChanged } = magicConnector({
chains,
options: { ...options, connectorType: 'dedicated' },
Expand Down Expand Up @@ -95,7 +95,7 @@ export function dedicatedWalletConnector({ chains, options }: DedicatedWalletCon
return output;
};

return createConnector(config => ({
return createConnector((config: any) => ({
id,
type,
name,
Expand Down Expand Up @@ -176,7 +176,7 @@ export function dedicatedWalletConnector({ chains, options }: DedicatedWalletCon

async getAccounts() {
const provider = await getProvider();
const accounts = (await provider?.request({
const accounts = (await (provider as any)?.request({
method: 'eth_accounts',
})) as string[];
return accounts.map(x => getAddress(x));
Expand All @@ -185,7 +185,7 @@ export function dedicatedWalletConnector({ chains, options }: DedicatedWalletCon
getChainId: async (): Promise<number> => {
const provider = await getProvider();
if (provider) {
const chainId = await provider.request({
const chainId = await (provider as any).request({
method: 'eth_chainId',
params: [],
});
Expand Down Expand Up @@ -288,12 +288,12 @@ export function dedicatedWalletConnector({ chains, options }: DedicatedWalletCon
return false;
},

onChainChanged(chain) {
onChainChanged(chain: string) {
const chainId = normalizeChainId(chain);
config.emitter.emit('change', { chainId });
},

async onConnect(connectInfo) {
async onConnect(connectInfo: { chainId: string }) {
const chainId = normalizeChainId(connectInfo.chainId);
const accounts = await this.getAccounts();
config.emitter.emit('connect', { accounts, chainId });
Expand Down
6 changes: 3 additions & 3 deletions src/lib/connectors/magicConnector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export interface MagicConnectorParams {
options: MagicOptions;
}

export function magicConnector({ chains = [], options }: MagicConnectorParams) {
export function magicConnector({ chains = [], options }: MagicConnectorParams): any {
if (!options.apiKey) {
throw new Error('Magic API Key is required. Get one at https://dashboard.magic.link/');
}
Expand Down Expand Up @@ -66,7 +66,7 @@ export function magicConnector({ chains = [], options }: MagicConnectorParams) {

const getAccount = async () => {
const provider = await getProvider();
const accounts = await provider?.request({
const accounts = await (provider as any)?.request({
method: 'eth_accounts',
});
const account = getAddress(accounts[0] as string);
Expand All @@ -81,7 +81,7 @@ export function magicConnector({ chains = [], options }: MagicConnectorParams) {
return createWalletClient({
account,
chain,
transport: custom(provider),
transport: custom(provider as any),
});
};

Expand Down
15 changes: 9 additions & 6 deletions src/lib/connectors/universalWalletConnector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ interface UniversalWalletConnectorParams {
options: UniversalWalletOptions;
}

export function universalWalletConnector({ chains, options }: UniversalWalletConnectorParams) {
export function universalWalletConnector({ chains, options }: UniversalWalletConnectorParams): any {
const { id, name, type, getAccount, getMagicSDK, getProvider, onAccountsChanged } = magicConnector({
chains,
options: { ...options, connectorType: 'universal' },
Expand All @@ -56,7 +56,7 @@ export function universalWalletConnector({ chains, options }: UniversalWalletCon
}
};

return createConnector(config => ({
return createConnector((config: any) => ({
id,
name,
type,
Expand Down Expand Up @@ -94,11 +94,11 @@ export function universalWalletConnector({ chains, options }: UniversalWalletCon
return accounts.map(x => getAddress(x));
},

onChainChanged: chain => {
onChainChanged: (chain: string) => {
const chainId = normalizeChainId(chain);
config.emitter.emit('change', { chainId });
},
async onConnect(connectInfo) {
async onConnect(connectInfo: { chainId: string }) {
const chainId = normalizeChainId(connectInfo.chainId);
const accounts = await this.getAccounts();
config.emitter.emit('connect', { accounts, chainId });
Expand All @@ -122,7 +122,7 @@ export function universalWalletConnector({ chains, options }: UniversalWalletCon
getChainId: async (): Promise<number> => {
const provider = await getProvider();
if (provider) {
const chainId = await provider.request({
const chainId = await (provider as any).request({
method: 'eth_chainId',
params: [],
});
Expand Down Expand Up @@ -164,8 +164,11 @@ export function universalWalletConnector({ chains, options }: UniversalWalletCon
const newOptions: MagicOptions = {
...options,
connectorType: 'universal',
magicSdkConfiguration: {
...options.magicSdkConfiguration,
network,
},
};
newOptions.magicSdkConfiguration!.network = network;

const { getAccount, getMagicSDK, getProvider, onAccountsChanged } = magicConnector({
chains,
Expand Down