Skip to content

Commit

Permalink
fix torus wallet chain id issue
Browse files Browse the repository at this point in the history
  • Loading branch information
chaitanyapotti committed Sep 26, 2023
1 parent 1249a7b commit e35bef2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
16 changes: 8 additions & 8 deletions demo/vue-app/src/lib/sol.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { Connection, LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transaction } from "@solana/web3.js";
import { CustomChainConfig, SafeEventEmitterProvider } from "@web3auth/base";
import { CustomChainConfig, IProvider } from "@web3auth/base";
import { SolanaWallet } from "@web3auth/solana-provider";
const getConnection = async (provider: SafeEventEmitterProvider): Promise<Connection> => {
const getConnection = async (provider: IProvider): Promise<Connection> => {
const solanaWallet = new SolanaWallet(provider);

const connectionConfig = await solanaWallet.request<never, CustomChainConfig>({ method: "solana_provider_config" });
Expand All @@ -19,7 +19,7 @@ function getNewTx(publicKeys, blockhash) {
return new Transaction({ recentBlockhash: blockhash, feePayer: new PublicKey(publicKeys![0]) }).add(inst);
}

export const getAccounts = async (provider: SafeEventEmitterProvider, uiConsole: any): Promise<string[] | undefined> => {
export const getAccounts = async (provider: IProvider, uiConsole: any): Promise<string[] | undefined> => {
try {
const solWeb3 = new SolanaWallet(provider);
const acc = await solWeb3.requestAccounts();
Expand All @@ -30,7 +30,7 @@ export const getAccounts = async (provider: SafeEventEmitterProvider, uiConsole:
uiConsole("error", error);
}
};
export const getBalance = async (provider: SafeEventEmitterProvider, uiConsole: any): Promise<void> => {
export const getBalance = async (provider: IProvider, uiConsole: any): Promise<void> => {
try {
const conn = await getConnection(provider);
const solanaWallet = new SolanaWallet(provider);
Expand All @@ -44,7 +44,7 @@ export const getBalance = async (provider: SafeEventEmitterProvider, uiConsole:
}
};

export const signAndSendTransaction = async (provider: SafeEventEmitterProvider, uiConsole: any) => {
export const signAndSendTransaction = async (provider: IProvider, uiConsole: any) => {
try {
const conn = await getConnection(provider);
const solWeb3 = new SolanaWallet(provider);
Expand All @@ -71,7 +71,7 @@ export const signAndSendTransaction = async (provider: SafeEventEmitterProvider,
}
};

export const signTransaction = async (provider: SafeEventEmitterProvider, uiConsole: any) => {
export const signTransaction = async (provider: IProvider, uiConsole: any) => {
try {
const conn = await getConnection(provider);
const solWeb3 = new SolanaWallet(provider);
Expand Down Expand Up @@ -101,7 +101,7 @@ export const signTransaction = async (provider: SafeEventEmitterProvider, uiCons
}
};

export const signMessage = async (provider: SafeEventEmitterProvider, uiConsole: any) => {
export const signMessage = async (provider: IProvider, uiConsole: any) => {
try {
const solWeb3 = new SolanaWallet(provider);
const msg = Buffer.from("Test Signing Message ", "utf8");
Expand All @@ -113,7 +113,7 @@ export const signMessage = async (provider: SafeEventEmitterProvider, uiConsole:
}
};

export const signAllTransactions = async (provider: SafeEventEmitterProvider, uiConsole: any) => {
export const signAllTransactions = async (provider: IProvider, uiConsole: any) => {
try {
const conn = await getConnection(provider);
const solWeb3 = new SolanaWallet(provider);
Expand Down
3 changes: 2 additions & 1 deletion demo/vue-app/src/whitelabel/whitelabel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ export default defineComponent({
this.loading = true;
this.web3auth = new Web3Auth({
uiConfig: {
appLogo: this.uiConfig.logoUrl,
logoLight: this.uiConfig.logoUrl,
logoDark: this.uiConfig.logoUrl,
theme: this.uiConfig.theme,
loginMethodsOrder: this.uiConfig.loginMethodsOrder,
defaultLanguage: this.uiConfig.defaultLanguage,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export class TorusWalletAdapter extends BaseEvmAdapter<never> {
this.emit(ADAPTER_EVENTS.CONNECTING, { adapter: WALLET_ADAPTERS.TORUS_EVM });
try {
await this.torusInstance.login(this.loginSettings);
const { chainId } = this.torusInstance.provider;
const chainId = await this.torusInstance.provider.request<string>({ method: "eth_chainId" });
if (chainId && parseInt(chainId) !== parseInt((this.chainConfig as CustomChainConfig).chainId, 16)) {
const { chainId: _chainId, blockExplorer, displayName, rpcTarget, ticker, tickerName } = this.chainConfig as CustomChainConfig;
const network: NetworkInterface = {
Expand Down

0 comments on commit e35bef2

Please sign in to comment.