Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/cruel-tires-cheer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"thirdweb": patch
---

Pass along chainId to internal 1193 provider when connecting
20 changes: 10 additions & 10 deletions packages/thirdweb/src/adapters/eip1193/from-eip1193.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
* Options for creating an EIP-1193 provider adapter.
*/
export type FromEip1193AdapterOptions = {
provider: EIP1193Provider | (() => Promise<EIP1193Provider>);
provider:
| EIP1193Provider
| ((params?: { chainId?: number }) => Promise<EIP1193Provider>);
walletId?: WalletId;
};

Expand Down Expand Up @@ -63,13 +65,11 @@
let account: Account | undefined = undefined;
let chain: Chain | undefined = undefined;
let provider: EIP1193Provider | undefined = undefined;
const getProvider = async () => {
if (!provider) {
provider =
typeof options.provider === "function"
? await options.provider()
: options.provider;
}
const getProvider = async (params?: { chainId?: number }) => {
provider =
typeof options.provider === "function"
? await options.provider(params)
: options.provider;
return provider;
};

Expand Down Expand Up @@ -118,7 +118,7 @@
const [connectedAccount, connectedChain, doDisconnect, doSwitchChain] =
await connectEip1193Wallet({
id,
provider: await getProvider(),
provider: await getProvider({ chainId: connectOptions.chain?.id }),
client: connectOptions.client,
chain: connectOptions.chain,
emitter,
Expand All @@ -141,7 +141,7 @@
const [connectedAccount, connectedChain, doDisconnect, doSwitchChain] =
await autoConnectEip1193Wallet({
id,
provider: await getProvider(),
provider: await getProvider({ chainId: connectOptions.chain?.id }),

Check warning on line 144 in packages/thirdweb/src/adapters/eip1193/from-eip1193.ts

View check run for this annotation

Codecov / codecov/patch

packages/thirdweb/src/adapters/eip1193/from-eip1193.ts#L144

Added line #L144 was not covered by tests
emitter,
chain: connectOptions.chain,
client: connectOptions.client,
Expand Down