Skip to content
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.

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

Fix: wagami connector support chain #362

Merged
merged 3 commits into from
Dec 22, 2023
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/four-seals-dance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@blocto/wagmi-connector': minor
---

Get blocto support list through api
18 changes: 10 additions & 8 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"mode": "exit",
"tag": "beta",
"initialVersions": {
"@blocto/aptos-wallet-adapter-plugin": "0.2.7-beta.0",
"@blocto/connectkit-connector": "0.2.2-beta.0",
"@blocto/rainbowkit-connector": "0.2.8-beta.0",
"@blocto/wagmi-connector": "1.2.4-beta.0",
"@blocto/web3-react-connector": "1.0.5-beta.1",
"@blocto/web3modal-connector": "0.1.3-beta.0",
"@blocto/sdk": "0.8.1-beta.1",
"@blocto/aptos-wallet-adapter-plugin": "0.2.7-beta.1",
"@blocto/connectkit-connector": "0.2.2-beta.1",
"@blocto/rainbowkit-connector": "0.2.8-beta.1",
"@blocto/wagmi-connector": "1.2.4-beta.1",
"@blocto/web3-react-connector": "1.0.5-beta.2",
"@blocto/web3modal-connector": "0.1.3-beta.1",
"@blocto/sdk": "0.9.0-beta.2",
"@blocto/dappauth": "2.2.0",
"eslint-config-custom": "0.0.0",
"tsconfig": "0.0.0"
Expand All @@ -18,8 +18,10 @@
"angry-turkeys-complain",
"eight-pugs-shop",
"fluffy-pandas-rule",
"four-seals-dance",
"polite-wasps-clean",
"pretty-lobsters-wonder",
"thin-dingos-share"
"thin-dingos-share",
"warm-rats-peel"
]
}
7 changes: 7 additions & 0 deletions adapters/connectkit-connector/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @blocto/connectkit-connector

## 0.2.2-beta.2

### Patch Changes

- Updated dependencies [fce0e50]
- @blocto/[email protected]

## 0.2.2-beta.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions adapters/connectkit-connector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@blocto/connectkit-connector",
"description": "blocto wallet connector to use with connectkit",
"author": "Blocto Wallet",
"version": "0.2.2-beta.1",
"version": "0.2.2-beta.2",
"type": "module",
"main": "./dist/index.umd.cjs",
"module": "./dist/index.js",
Expand Down Expand Up @@ -30,7 +30,7 @@
"/dist"
],
"dependencies": {
"@blocto/wagmi-connector": "^1.2.4-beta.1"
"@blocto/wagmi-connector": "^1.3.0-beta.2"
},
"peerDependencies": {
"connectkit": "^1.5.3",
Expand Down
7 changes: 7 additions & 0 deletions adapters/rainbowkit-connector/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @blocto/rainbowkit-connector

## 0.2.8-beta.2

### Patch Changes

- Updated dependencies [fce0e50]
- @blocto/[email protected]

## 0.2.8-beta.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions adapters/rainbowkit-connector/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@blocto/rainbowkit-connector",
"version": "0.2.8-beta.1",
"version": "0.2.8-beta.2",
"description": "blocto wallet connector to use rainbowkit",
"author": "Blocto Wallet",
"main": "./dist/index.js",
Expand Down Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {
"@rainbow-me/rainbowkit": "^1.0.8",
"@blocto/wagmi-connector": "^1.2.4-beta.1"
"@blocto/wagmi-connector": "^1.3.0-beta.2"
},
"devDependencies": {
"@types/jest": "^29.5.2",
Expand Down
11 changes: 11 additions & 0 deletions adapters/wagmi-connector/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @blocto/wagmi-connector

## 1.3.0-beta.2

### Minor Changes

- fce0e50: Get blocto support list through api

### Patch Changes

- Updated dependencies [d34fca2]
- @blocto/[email protected]

## 1.2.4-beta.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions adapters/wagmi-connector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@blocto/wagmi-connector",
"description": "Blocto wallet connector extend from wagmi Connector",
"author": "Calvin Chang",
"version": "1.2.4-beta.1",
"version": "1.3.0-beta.2",
"type": "module",
"main": "./dist/index.umd.cjs",
"module": "./dist/index.js",
Expand All @@ -28,7 +28,7 @@
"/dist"
],
"dependencies": {
"@blocto/sdk": "^0.9.0-beta.2"
"@blocto/sdk": "^0.9.0-beta.3"
},
"peerDependencies": {
"@wagmi/core": ">=1",
Expand Down
34 changes: 19 additions & 15 deletions adapters/wagmi-connector/src/connector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ class BloctoConnector extends Connector<BloctoProvider, BloctoOptions> {
const _chainId = chainId ?? this.chains[0]?.id;
const config: EthereumProviderConfig = {
chainId: _chainId,
rpc:
this.chains.find((x) => x.id === _chainId)?.rpcUrls.default.http?.[0],
rpc: this.chains.find((x) => x.id === _chainId)?.rpcUrls.default
.http?.[0],
};
this.#provider = new BloctoSDK({ ethereum: config, appId })?.ethereum;
}
Expand Down Expand Up @@ -133,22 +133,26 @@ class BloctoConnector extends Connector<BloctoProvider, BloctoOptions> {
}

async switchChain(chainId: number): Promise<Chain> {
const provider = await this.getProvider();
const id = numberToHex(chainId);
const chain = this.chains.find((x) => x.id === chainId);
const isBloctoSupportChain =
provider._blocto.supportNetworkList[`${chainId}`];

if (!chain || !isBloctoSupportChain) {
throw new SwitchChainError(new Error(`Blocto unsupported chain: ${id}`));
}

try {
const provider = await this.getProvider();
const id = numberToHex(chainId);
const chain = this.chains.find((x) => x.id === chainId);
const networks = await provider.supportChainList();
const evmSupportMap = networks.reduce(
(a: any, v: any) => ({ ...a, [v.chain_id]: v }),
{}
);
const isBloctoSupportChain = evmSupportMap[`${chainId}`];

if (!chain || !isBloctoSupportChain) {
throw new SwitchChainError(
new Error(`Blocto unsupported chain: ${id}`)
);
}

await provider.request({
method: 'wallet_addEthereumChain',
params: [
{ chainId: id, rpcUrls: chain?.rpcUrls.default.http },
],
params: [{ chainId: id, rpcUrls: chain?.rpcUrls.default.http }],
});
await provider.request({
method: 'wallet_switchEthereumChain',
Expand Down
7 changes: 7 additions & 0 deletions adapters/web3modal-connector/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @blocto/web3modal-connector

## 0.1.3-beta.2

### Patch Changes

- Updated dependencies [fce0e50]
- @blocto/[email protected]

## 0.1.3-beta.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions adapters/web3modal-connector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@blocto/web3modal-connector",
"description": "Blocto connector extend from wagmi Connector to use with web3modal",
"author": "Blocto Wallet",
"version": "0.1.3-beta.1",
"version": "0.1.3-beta.2",
"type": "module",
"main": "./dist/index.umd.cjs",
"module": "./dist/index.js",
Expand Down Expand Up @@ -41,6 +41,6 @@
"/dist"
],
"dependencies": {
"@blocto/wagmi-connector": "^1.2.4-beta.1"
"@blocto/wagmi-connector": "^1.3.0-beta.2"
}
}
6 changes: 6 additions & 0 deletions packages/blocto-sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @blocto/sdk

## 0.9.0-beta.3

### Minor Changes

- d34fca2: Add RPC endpoints for the L2 chains (Sepolia, Arbitrum Sepolia, Optimism Sepolia, Base, Base Goerli, Base Sepolia, Zora, Zora Goerli, Zora Sepolia, Scroll, Scroll Goerli, Scroll Sepolia, Linea, Linea Goerli and zKatana Sepolia)

## 0.9.0-beta.2

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/blocto-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@blocto/sdk",
"version": "0.9.0-beta.2",
"version": "0.9.0-beta.3",
"repository": "[email protected]:portto/blocto-sdk.git",
"author": "Chiaki.C",
"license": "MIT",
Expand Down
Loading