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.

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

[Issue-3897] Update chainlist #3956

Merged
merged 6 commits into from
Jan 3, 2025
Merged

[Issue-3897] Update chainlist #3956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dcec5f7
[Issue-3897] Update chainlist
PDTnhah Dec 31, 2024
581f6a8
[Issue-3897] Update chainlist
PDTnhah Jan 2, 2025
a08ec2e
[Issue-3897] Update stable version for chain-list
S2kael Jan 2, 2025
3dc8701
[Issue-3897] [Hotfix] Catch error when create erc20 tx
S2kael Jan 3, 2025
7c77edf
[Issue-3897] Update error message
S2kael Jan 3, 2025
83283b5
Merge branch 'subwallet-dev' into koni/dev/issue-3897
S2kael Jan 3, 2025
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"@polkadot/types-support": "^15.0.1",
"@polkadot/util": "^13.2.3",
"@polkadot/util-crypto": "^13.2.3",
"@subwallet/chain-list": "0.2.96-beta.8",
"@subwallet/chain-list": "0.2.97",
"@subwallet/keyring": "^0.1.8-beta.0",
"@subwallet/react-ui": "5.1.2-b79",
"@subwallet/ui-keyring": "0.1.8-beta.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@reduxjs/toolkit": "^1.9.1",
"@sora-substrate/type-definitions": "^1.17.7",
"@substrate/connect": "^0.8.9",
"@subwallet/chain-list": "0.2.96-beta.8",
"@subwallet/chain-list": "0.2.97",
"@subwallet/extension-base": "^1.3.11-0",
"@subwallet/extension-chains": "^1.3.11-0",
"@subwallet/extension-dapp": "^1.3.11-0",
Expand Down
5 changes: 4 additions & 1 deletion packages/extension-base/src/services/balance-service/transfer/smart-contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ export async function getERC20TransactionObject (
const transferData = generateTransferData(to, transferValue);
const [gasLimit, priority] = await Promise.all([
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
erc20Contract.methods.transfer(to, transferValue).estimateGas({ from }) as number,
erc20Contract.methods.transfer(to, transferValue).estimateGas({ from })
.catch(() => {
throw Error('Unable to estimate fee for this transaction. Try again or contact support at [email protected]');
}) as number,
calculateGasFeeParams(evmApi, networkKey)
]);

Expand Down
2 changes: 1 addition & 1 deletion packages/extension-base/src/services/chain-service/utils/patch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';

const ChainListVersion = '0.2.96'; // update this when build chainlist
const ChainListVersion = '0.2.97'; // update this when build chainlist

// todo: move this interface to chainlist
export interface PatchInfo {
Expand Down
4 changes: 4 additions & 0 deletions packages/extension-base/src/services/transaction-service/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ function getBlockExplorerAccountRoute (explorerLink: string) {
return '#/accounts';
}

if (explorerLink.includes('laos.statescan.io')) {
return '#/accounts';
}

if (explorerLink.includes('explorer.zkverify.io')) {
return 'account';
}
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-koni-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@polkadot/util-crypto": "^12.6.2",
"@ramonak/react-progress-bar": "^5.0.3",
"@reduxjs/toolkit": "^1.9.1",
"@subwallet/chain-list": "0.2.96-beta.8",
"@subwallet/chain-list": "0.2.97",
"@subwallet/extension-base": "^1.3.11-0",
"@subwallet/extension-chains": "^1.3.11-0",
"@subwallet/extension-dapp": "^1.3.11-0",
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-web-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@polkadot/util-crypto": "^12.6.2",
"@ramonak/react-progress-bar": "^5.0.3",
"@reduxjs/toolkit": "^1.9.1",
"@subwallet/chain-list": "0.2.96-beta.8",
"@subwallet/chain-list": "0.2.97",
"@subwallet/extension-base": "^1.3.11-0",
"@subwallet/extension-chains": "^1.3.11-0",
"@subwallet/extension-dapp": "^1.3.11-0",
Expand Down
14 changes: 7 additions & 7 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6439,15 +6439,15 @@ __metadata:
languageName: node
linkType: hard

"@subwallet/chain-list@npm:0.2.96-beta.8":
version: 0.2.96
resolution: "@subwallet/chain-list@npm:0.2.96-beta.8"
"@subwallet/chain-list@npm:0.2.97":
version: 0.2.97
resolution: "@subwallet/chain-list@npm:0.2.97"
dependencies:
"@polkadot/dev": 0.67.167
"@polkadot/util": ^12.5.1
eventemitter3: ^5.0.1
ts-md5: ^1.3.1
checksum: 45f78eb53c370e714eb014fb655ec85ccfff36cb79de68440c98ce6d53212aeb380351e4f77d4e7a5bdee8df33beff3164227ea24ffa0e0c54adf06e3f25deee
checksum: 3271231e2c5b435dd2f4c502da5af8b547a5ac8aafe7089d09c9966fd74b233eb4077d04e0c960857d5b5e2fbd29f178f08aec473e6ec23d19bd07b6642af432
languageName: node
linkType: hard

Expand Down Expand Up @@ -6490,7 +6490,7 @@ __metadata:
"@reduxjs/toolkit": ^1.9.1
"@sora-substrate/type-definitions": ^1.17.7
"@substrate/connect": ^0.8.9
"@subwallet/chain-list": 0.2.96-beta.8
"@subwallet/chain-list": 0.2.97
"@subwallet/extension-base": ^1.3.11-0
"@subwallet/extension-chains": ^1.3.11-0
"@subwallet/extension-dapp": ^1.3.11-0
Expand Down Expand Up @@ -6629,7 +6629,7 @@ __metadata:
"@polkadot/util-crypto": ^12.6.2
"@ramonak/react-progress-bar": ^5.0.3
"@reduxjs/toolkit": ^1.9.1
"@subwallet/chain-list": 0.2.96-beta.8
"@subwallet/chain-list": 0.2.97
"@subwallet/extension-base": ^1.3.11-0
"@subwallet/extension-chains": ^1.3.11-0
"@subwallet/extension-dapp": ^1.3.11-0
Expand Down Expand Up @@ -6769,7 +6769,7 @@ __metadata:
"@polkadot/util-crypto": ^12.6.2
"@ramonak/react-progress-bar": ^5.0.3
"@reduxjs/toolkit": ^1.9.1
"@subwallet/chain-list": 0.2.96-beta.8
"@subwallet/chain-list": 0.2.97
"@subwallet/extension-base": ^1.3.11-0
"@subwallet/extension-chains": ^1.3.11-0
"@subwallet/extension-dapp": ^1.3.11-0
Expand Down
Loading