Skip to content

Commit

Permalink
log wallet info for wallet connect wallets
Browse files Browse the repository at this point in the history
  • Loading branch information
toddkao committed Feb 7, 2025
1 parent 1a3fcf5 commit f0f8df8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
6 changes: 0 additions & 6 deletions packages/client/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1859,31 +1859,25 @@ export class SkipClient {
(chain) => chain.chainID === userAddress.chainID,
);

console.log(chain);
console.log(userAddresses);

switch (chain?.chainType) {
case types.ChainType.Cosmos:
try {
const { prefix } = fromBech32(userAddress.address);
return chain.bech32Prefix === prefix;
} catch (_error) {
console.log(_error);
return false;
}
case types.ChainType.EVM:
try {
return isAddress(userAddress.address);
} catch (_error) {
console.log(_error);
return false;
}
case types.ChainType.SVM:
try {
const publicKey = new PublicKey(userAddress.address);
return PublicKey.isOnCurve(publicKey);
} catch (_error) {
console.log(_error);
return false;
}
default:
Expand Down
17 changes: 14 additions & 3 deletions packages/widget/src/hooks/useCreateEvmWallets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export const useCreateEvmWallets = () => {
},
address: address,
});

setEvmWallet({
walletName: connector.id,
walletPrettyName: connector.name,
Expand Down Expand Up @@ -112,14 +113,15 @@ export const useCreateEvmWallets = () => {
await connector?.switchChain?.({
chainId: Number(1),
});
const account = await connector.getAccounts();
updateWalletState(account[0]);
return;
}
if (isEvmConnected && connector.id !== currentEvmConnector?.id) {
await currentConnector?.disconnect();
}
try {
console.log("connect");
const response = await connectAsync({ connector, chainId: Number(1) });
const response = await connectAsync({ connector });
updateWalletState(response.accounts[0]);
const chain = chains?.find((x) => x.chainID === "1");
const asset = assets?.find((x) => x.denom === "ethereum-native");
Expand Down Expand Up @@ -148,15 +150,24 @@ export const useCreateEvmWallets = () => {
await connector?.switchChain?.({
chainId: Number(chainID),
});
const account = await connector.getAccounts();
updateWalletState(account[0]);
return;
}
if (isEvmConnected && connector.id !== currentEvmConnector?.id) {
await currentConnector?.disconnect();
}

try {
const response = await connectAsync({ connector, chainId: Number(chainID) });
updateWalletState(response.accounts[0]);
const account = await connector.getAccounts();

const provider = await connector.getProvider();
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const walletInfo = (provider as any).session?.peer;
console.log(walletInfo);

callbacks?.onWalletConnected?.({
walletName: connector.name,
chainId: chainID,
Expand All @@ -170,6 +181,7 @@ export const useCreateEvmWallets = () => {
}
},
getAddress: async ({ signRequired, context }) => {
console.log("get address");
try {
const address = await evmGetAddress({ signRequired, context });
return address;
Expand Down Expand Up @@ -228,7 +240,6 @@ export const useCreateEvmWallets = () => {
evmWallet?.address,
isEvmConnected,
chainId,
evmAddress,
connectAsync,
setEvmWallet,
currentConnector,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export function useSwapExecutionState({

return SwapExecutionState.ready;
}, [
chainAddresses,
userAddresses,
route?.requiredChainAddresses,
overallStatus,
isValidatingGasBalance,
Expand Down

0 comments on commit f0f8df8

Please sign in to comment.