Skip to content

Commit 2d4d197

Browse files
bluezdotbluezdot
committed
Merge branch 'refs/heads/subwallet-dev' into koni/dev/get-all-targets
# Conflicts: # packages/extension-base/src/koni/background/handlers/Extension.ts # packages/extension-base/src/services/swap-service/utils.ts
2 parents d4da47d + 256f98f commit 2d4d197

File tree

254 files changed

+10987
-2682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+10987
-2682
lines changed

‎.123trigger

+4-1
Original file line numberDiff line numberDiff line change
@@ -185,4 +185,7 @@
185185
1.3.17
186186
1.3.18
187187
1.3.19
188-
1.3.20
188+
1.3.20
189+
1.3.21
190+
1.3.22
191+
1.3.23

‎.env.example

+4
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ BITTENSOR_API_KEY_8=tao-abafdbad8
1414
BITTENSOR_API_KEY_9=tao-abafdbad9
1515
BITTENSOR_API_KEY_10=tao-abafdbad10
1616
SIMPLE_SWAP_API_KEY=26c8c21
17+
UNISWAP_API_KEY=D3D2BvnTo
18+
SUBWALLET_API=http://localhost:3000/api
19+
BLOCKFROST_API_KEY_MAIN=mainnetabcxyz
20+
BLOCKFROST_API_KEY_PREP=preprodabcxyz

‎.github/workflows/push-koni-dev.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }}
4848
COINBASE_PAY_ID: ${{ secrets.COINBASE_PAY_ID }}
4949
CHAINFLIP_BROKER_API: ${{ secrets.CHAINFLIP_BROKER_API }}
50-
BITTENSOR_API_KEY_1: ${{ secrets.BITTENSOR_API_KEY_1 }}
50+
BITTENSOR_API_KEY_1: ${{ secrets.BITTENSOR_API_KEY_1 }}
5151
BITTENSOR_API_KEY_2: ${{ secrets.BITTENSOR_API_KEY_2 }}
5252
BITTENSOR_API_KEY_3: ${{ secrets.BITTENSOR_API_KEY_3 }}
5353
BITTENSOR_API_KEY_4: ${{ secrets.BITTENSOR_API_KEY_4 }}
@@ -58,6 +58,10 @@ jobs:
5858
BITTENSOR_API_KEY_9: ${{ secrets.BITTENSOR_API_KEY_9 }}
5959
BITTENSOR_API_KEY_10: ${{ secrets.BITTENSOR_API_KEY_10 }}
6060
SIMPLE_SWAP_API_KEY: ${{ secrets.SIMPLE_SWAP_API_KEY }}
61+
UNISWAP_API_KEY: ${{ secrets.UNISWAP_API_KEY }}
62+
SUBWALLET_API: ${{ secrets.SUBWALLET_API }}
63+
BLOCKFROST_API_KEY_MAIN: ${{ secrets.BLOCKFROST_API_KEY_MAIN }}
64+
BLOCKFROST_API_KEY_PREP: ${{ secrets.BLOCKFROST_API_KEY_PREP }}
6165
GH_RELEASE_FILES: master-build.zip,master-src.zip
6266
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
6367
REF_NAME: ${{ github.ref_name }}

‎.github/workflows/push-master.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }}
2929
COINBASE_PAY_ID: ${{ secrets.COINBASE_PAY_ID }}
3030
CHAINFLIP_BROKER_API: ${{ secrets.CHAINFLIP_BROKER_API }}
31-
BITTENSOR_API_KEY_1: ${{ secrets.BITTENSOR_API_KEY_1 }}
31+
BITTENSOR_API_KEY_1: ${{ secrets.BITTENSOR_API_KEY_1 }}
3232
BITTENSOR_API_KEY_2: ${{ secrets.BITTENSOR_API_KEY_2 }}
3333
BITTENSOR_API_KEY_3: ${{ secrets.BITTENSOR_API_KEY_3 }}
3434
BITTENSOR_API_KEY_4: ${{ secrets.BITTENSOR_API_KEY_4 }}
@@ -39,6 +39,10 @@ jobs:
3939
BITTENSOR_API_KEY_9: ${{ secrets.BITTENSOR_API_KEY_9 }}
4040
BITTENSOR_API_KEY_10: ${{ secrets.BITTENSOR_API_KEY_10 }}
4141
SIMPLE_SWAP_API_KEY: ${{ secrets.SIMPLE_SWAP_API_KEY }}
42+
UNISWAP_API_KEY: ${{ secrets.UNISWAP_API_KEY }}
43+
SUBWALLET_API: ${{ secrets.SUBWALLET_API }}
44+
BLOCKFROST_API_KEY_MAIN: ${{ secrets.BLOCKFROST_API_KEY_MAIN }}
45+
BLOCKFROST_API_KEY_PREP: ${{ secrets.BLOCKFROST_API_KEY_PREP }}
4246
BRANCH_NAME: ${{ github.ref_name }}
4347
run: |
4448
yarn install --immutable | grep -v 'YN0013'

‎.github/workflows/push-web-runner.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }}
3333
COINBASE_PAY_ID: ${{ secrets.COINBASE_PAY_ID }}
3434
CHAINFLIP_BROKER_API: ${{ secrets.CHAINFLIP_BROKER_API }}
35-
BITTENSOR_API_KEY_1: ${{ secrets.BITTENSOR_API_KEY_1 }}
35+
BITTENSOR_API_KEY_1: ${{ secrets.BITTENSOR_API_KEY_1 }}
3636
BITTENSOR_API_KEY_2: ${{ secrets.BITTENSOR_API_KEY_2 }}
3737
BITTENSOR_API_KEY_3: ${{ secrets.BITTENSOR_API_KEY_3 }}
3838
BITTENSOR_API_KEY_4: ${{ secrets.BITTENSOR_API_KEY_4 }}
@@ -43,6 +43,10 @@ jobs:
4343
BITTENSOR_API_KEY_9: ${{ secrets.BITTENSOR_API_KEY_9 }}
4444
BITTENSOR_API_KEY_10: ${{ secrets.BITTENSOR_API_KEY_10 }}
4545
SIMPLE_SWAP_API_KEY: ${{ secrets.SIMPLE_SWAP_API_KEY }}
46+
UNISWAP_API_KEY: ${{ secrets.UNISWAP_API_KEY }}
47+
SUBWALLET_API: ${{ secrets.SUBWALLET_API }}
48+
BLOCKFROST_API_KEY_MAIN: ${{ secrets.BLOCKFROST_API_KEY_MAIN }}
49+
BLOCKFROST_API_KEY_PREP: ${{ secrets.BLOCKFROST_API_KEY_PREP }}
4650
BRANCH_NAME: master
4751
run: |
4852
yarn install --immutable | grep -v 'YN0013'

‎.github/workflows/push-webapp.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
COINBASE_PAY_ID: ${{ secrets.COINBASE_PAY_ID }}
3333
NFT_MINTING_HOST: ${{ secrets.NFT_MINTING_HOST }}
3434
CHAINFLIP_BROKER_API: ${{ secrets.CHAINFLIP_BROKER_API }}
35-
BITTENSOR_API_KEY_1: ${{ secrets.BITTENSOR_API_KEY_1 }}
35+
BITTENSOR_API_KEY_1: ${{ secrets.BITTENSOR_API_KEY_1 }}
3636
BITTENSOR_API_KEY_2: ${{ secrets.BITTENSOR_API_KEY_2 }}
3737
BITTENSOR_API_KEY_3: ${{ secrets.BITTENSOR_API_KEY_3 }}
3838
BITTENSOR_API_KEY_4: ${{ secrets.BITTENSOR_API_KEY_4 }}
@@ -43,6 +43,10 @@ jobs:
4343
BITTENSOR_API_KEY_9: ${{ secrets.BITTENSOR_API_KEY_9 }}
4444
BITTENSOR_API_KEY_10: ${{ secrets.BITTENSOR_API_KEY_10 }}
4545
SIMPLE_SWAP_API_KEY: ${{ secrets.SIMPLE_SWAP_API_KEY }}
46+
UNISWAP_API_KEY: ${{ secrets.UNISWAP_API_KEY }}
47+
SUBWALLET_API: ${{ secrets.SUBWALLET_API }}
48+
BLOCKFROST_API_KEY_MAIN: ${{ secrets.BLOCKFROST_API_KEY_MAIN }}
49+
BLOCKFROST_API_KEY_PREP: ${{ secrets.BLOCKFROST_API_KEY_PREP }}
4650
BRANCH_NAME: ${{ github.ref_name }}
4751
run: |
4852
yarn install --immutable | grep -v 'YN0013'

‎CHANGELOG.md

+29
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
11
# CHANGELOG
22

3+
## 1.3.23
4+
Build date: Mar 05, 2025.
5+
6+
Features & Update:
7+
- Support Uniswap (#3977)
8+
- Support Cardano (#3816, #3924, #3925, #3942)
9+
- Support Migrate account feature (#3926, #4016)
10+
- Unified address format integration (#3864)
11+
12+
Bug fixed:
13+
- Fix Bug when unstaking vDOT, vMANTA (#4054)
14+
15+
## 1.3.22
16+
Build date: Mar 04, 2025.
17+
18+
Features & Update:
19+
- Support staking for Mythos (#3984)
20+
21+
22+
## 1.3.21
23+
Build date: Feb 28, 2025.
24+
25+
Features & Update:
26+
- Allow signing once for multiple transactions (#3901)
27+
- Update chain-list stable v0.2.99 (#4007)
28+
29+
330
## 1.3.20
431
Build date: Feb 24, 2025.
532

@@ -9,12 +36,14 @@ Features & Update:
936
Bug fixed:
1037
- Fixed bug Unable to estimate fee when signing for dApp (#4050)
1138

39+
1240
## 1.3.19
1341
Build date: Feb 21, 2025.
1442

1543
Bug fixed:
1644
- Fixed bug related to custom token to paid fee
1745

46+
1847
## 1.3.18
1948
Build date: Feb 20, 2025.
2049

‎CONTRIBUTORS

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
2956 AnhMTV Release version 1.3.20
2-
2552 Nam Phạm [Issue 3855] test: add log
3-
2418 S2kael [Issue-4050] Fix error with transaction has no fee params
1+
2966 AnhMTV Release version 1.3.23
2+
2553 Nam Phạm feat: remove chainflip sdk dependency
3+
2513 S2kael
44
869 lw-cdm [MasterAccount] Update logic to reorder account on select account modal
5+
664 bluezdot [Issue-3984] feat: update param for mythos
56
568 nguyentiendung [Issue-3553] [Issue-3553] Refactor code and add recipient to swap history.
6-
538 bluezdot [Issue-chainlist-399] feat: enable transferring on Invarch
77
465 Jaco 0.42.5 (#969)
88
354 Thiendekaco [Issue-3707] [fix] Unified account - fix dApp ui bug #4
9-
222 Frenkie Nguyen [Issue-3590] feat: sort list token
9+
244 Frenkie Nguyen [Issue-3864] refactor: handle gohome in QR modal
1010
186 dominhquang [Issue-3507] Fix UI bug for Notification
1111
185 quangdo
1212
170 lw-cdm
13+
165 lw [Issue-3864] Update UX logic related to reformated address for AddressInputNew
1314
160 Automation Bot [CI Skip] Auto increase webapp build number
15+
146 tunghp2002 Update chain-list
1416
128 PDTnhah [Issue-4029] Test: Test API key
15-
128 tunghp2002 [Update] Convert to Tao balance
1617
104 khainh predefine metadata for Polkadot & Kusama chains
17-
98 lw [Issue-3658] Update some UX issues for fee editor
1818
83 Hieu Dao Update README.md
1919
83 leewong
2020
82 Thibaut Sardan Add account filtering feature (#832)
21-
74 bluedot [Issue-3888] build: upgrade version polkadot api
21+
77 bluedot [Issue-3888] build: upgrade version polkadot api
2222
63 Roman fix ui issues
2323
53 Dominhquangdev update Bridge code
24-
27 S2kael [Issue-3590] Add TODO
24+
28 S2kael [Issue-3658] Hide estimate fee field on Send Fund screen with cardano chain
2525
10 Trang Trịnh api get karura and acala nfts
2626
9 Minh Le
2727
9 minhld1029 [#115] [ForgetAccount] catch exception refList undefined

‎package.json

+21-20
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"url": "https://github.com/Koniverse/Subwallet-V2.git"
1111
},
1212
"sideEffects": false,
13-
"version": "1.3.20",
13+
"version": "1.3.23",
1414
"workspaces": [
1515
"packages/*"
1616
],
@@ -45,7 +45,7 @@
4545
"start": "yarn watch",
4646
"test": "polkadot-dev-run-test --detectOpenHandles --testPathIgnorePatterns='/node_modules/|.*/ignore-.*\\.(test|spec)\\..*'",
4747
"test:one": "polkadot-dev-run-test --detectOpenHandles",
48-
"update:polkadot-libs": "yarn up @polkadot/api @polkadot/rpc-provider @polkadot/api-contract @polkadot/networks @polkadot/types @polkadot/types-augment @polkadot/util @polkadot/util-crypto @polkadot/api-derive @polkadot/apps-config @polkadot/ui-settings @polkadot/hw-ledger @polkadot/phishing @polkadot/util @polkadot/util-crypto",
48+
"update:polkadot-libs": "yarn up @polkadot/api @polkadot/api-base @polkadot/rpc-provider @polkadot/api-contract @polkadot/networks @polkadot/types @polkadot/types-augment @polkadot/types-known @polkadot/util @polkadot/util-crypto @polkadot/api-derive @polkadot/apps-config @polkadot/ui-settings @polkadot/hw-ledger @polkadot/phishing @polkadot/util @polkadot/util-crypto @polkadot/x-global",
4949
"update:subwallet-libs": "yarn up @subwallet/chain-list @subwallet/keyring @subwallet/ui-keyring",
5050
"watch": "cd packages/extension-koni && yarn polkadot-exec-webpack --config webpack.config.cjs --mode development --watch",
5151
"watch-dev": "cd packages/extension-koni && yarn polkadot-exec-webpack --config webpack.config.cjs --mode development --watch -d inline-source-map",
@@ -90,25 +90,26 @@
9090
"@ledgerhq/hw-app-eth": "6.33.4",
9191
"@ledgerhq/hw-transport": "6.30.3",
9292
"@mangata-finance/type-definitions": "2.1.2",
93-
"@polkadot/api": "^15.0.1",
94-
"@polkadot/api-augment": "^15.0.1",
95-
"@polkadot/api-base": "^15.0.1",
96-
"@polkadot/api-contract": "^15.0.1",
97-
"@polkadot/api-derive": "^15.0.1",
98-
"@polkadot/networks": "^13.2.3",
99-
"@polkadot/rpc-augment": "^15.0.1",
100-
"@polkadot/rpc-core": "^15.0.1",
101-
"@polkadot/rpc-provider": "^15.0.1",
102-
"@polkadot/types": "^15.0.1",
103-
"@polkadot/types-codec": "^15.0.1",
104-
"@polkadot/types-known": "^15.0.1",
105-
"@polkadot/types-support": "^15.0.1",
106-
"@polkadot/util": "^13.2.3",
107-
"@polkadot/util-crypto": "^13.2.3",
108-
"@subwallet/chain-list": "0.2.99",
109-
"@subwallet/keyring": "^0.1.8-beta.0",
93+
"@polkadot/api": "^15.7.2",
94+
"@polkadot/api-augment": "^15.7.2",
95+
"@polkadot/api-base": "^15.7.2",
96+
"@polkadot/api-contract": "^15.7.2",
97+
"@polkadot/api-derive": "^15.7.2",
98+
"@polkadot/networks": "^13.4.3",
99+
"@polkadot/rpc-augment": "^15.7.2",
100+
"@polkadot/rpc-core": "^15.7.2",
101+
"@polkadot/rpc-provider": "^15.7.2",
102+
"@polkadot/types": "^15.7.2",
103+
"@polkadot/types-codec": "^15.7.2",
104+
"@polkadot/types-known": "^15.7.2",
105+
"@polkadot/types-support": "^15.7.2",
106+
"@polkadot/util": "^13.4.3",
107+
"@polkadot/util-crypto": "^13.4.3",
108+
"@polkadot/x-global": "^13.4.3",
109+
"@subwallet/chain-list": "0.2.101",
110+
"@subwallet/keyring": "^0.1.9",
110111
"@subwallet/react-ui": "5.1.2-b79",
111-
"@subwallet/ui-keyring": "0.1.8-beta.0",
112+
"@subwallet/ui-keyring": "^0.1.9",
112113
"@types/bn.js": "^5.1.6",
113114
"@zondax/ledger-substrate": "1.0.1",
114115
"babel-core": "^7.0.0-bridge.0",

‎packages/extension-base/package.json

+27-26
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"./detectPackage.cjs"
1818
],
1919
"type": "module",
20-
"version": "1.3.20-0",
20+
"version": "1.3.23-0",
2121
"main": "index.js",
2222
"dependencies": {
2323
"@acala-network/api": "^5.0.2",
2424
"@apollo/client": "^3.7.14",
2525
"@azns/resolver-core": "^1.4.0",
26-
"@chainflip/sdk": "^1.6.0",
26+
"@emurgo/cardano-serialization-lib-nodejs": "^13.2.0",
2727
"@equilab/api": "~1.14.25",
2828
"@ethereumjs/common": "^4.1.0",
2929
"@ethereumjs/tx": "^5.1.0",
@@ -36,32 +36,33 @@
3636
"@metaverse-network-sdk/type-definitions": "^0.0.1-13",
3737
"@oak-foundation/types": "^0.0.23",
3838
"@polkadot-api/merkleize-metadata": "^1.1.0",
39-
"@polkadot/api": "^15.0.1",
40-
"@polkadot/api-base": "^15.0.1",
41-
"@polkadot/api-contract": "^15.0.1",
42-
"@polkadot/api-derive": "^15.0.1",
43-
"@polkadot/apps-config": "^0.137.1",
44-
"@polkadot/hw-ledger": "^12.6.2",
45-
"@polkadot/networks": "^13.2.3",
46-
"@polkadot/phishing": "^0.22.7",
47-
"@polkadot/rpc-provider": "^15.0.1",
48-
"@polkadot/types": "^15.0.1",
49-
"@polkadot/types-augment": "^15.0.1",
50-
"@polkadot/types-known": "^15.0.1",
51-
"@polkadot/ui-settings": "^3.6.6",
52-
"@polkadot/util": "^13.2.3",
53-
"@polkadot/util-crypto": "^13.2.3",
54-
"@polkadot/x-global": "^12.2.1",
39+
"@polkadot/api": "^15.7.2",
40+
"@polkadot/api-base": "^15.7.2",
41+
"@polkadot/api-contract": "^15.7.2",
42+
"@polkadot/api-derive": "^15.7.2",
43+
"@polkadot/apps-config": "^0.150.2",
44+
"@polkadot/hw-ledger": "^13.4.3",
45+
"@polkadot/networks": "^13.4.3",
46+
"@polkadot/phishing": "^0.25.4",
47+
"@polkadot/rpc-provider": "^15.7.2",
48+
"@polkadot/types": "^15.7.2",
49+
"@polkadot/types-augment": "^15.7.2",
50+
"@polkadot/types-known": "^15.7.2",
51+
"@polkadot/ui-settings": "^3.12.2",
52+
"@polkadot/util": "^13.4.3",
53+
"@polkadot/util-crypto": "^13.4.3",
54+
"@polkadot/x-global": "^13.4.3",
5555
"@reduxjs/toolkit": "^1.9.1",
5656
"@sora-substrate/type-definitions": "^1.17.7",
5757
"@substrate/connect": "^0.8.9",
58-
"@subwallet/chain-list": "0.2.99",
59-
"@subwallet/extension-base": "^1.3.20-0",
60-
"@subwallet/extension-chains": "^1.3.20-0",
61-
"@subwallet/extension-dapp": "^1.3.20-0",
62-
"@subwallet/extension-inject": "^1.3.20-0",
63-
"@subwallet/keyring": "^0.1.8-beta.0",
64-
"@subwallet/ui-keyring": "^0.1.8-beta.0",
58+
"@subwallet/chain-list": "0.2.101",
59+
"@subwallet/extension-base": "^1.3.23-0",
60+
"@subwallet/extension-chains": "^1.3.23-0",
61+
"@subwallet/extension-dapp": "^1.3.23-0",
62+
"@subwallet/extension-inject": "^1.3.23-0",
63+
"@subwallet/keyring": "^0.1.9",
64+
"@subwallet/subwallet-api-sdk": "^1.3.23-0",
65+
"@subwallet/ui-keyring": "^0.1.9",
6566
"@ton/core": "^0.56.3",
6667
"@ton/crypto": "^3.2.0",
6768
"@ton/ton": "^15.0.0",
@@ -105,7 +106,7 @@
105106
"web3-utils": "^1.10.0"
106107
},
107108
"devDependencies": {
108-
"@subwallet/extension-mocks": "^1.3.20-0",
109+
"@subwallet/extension-mocks": "^1.3.23-0",
109110
"@types/uuid": "^9.0.1"
110111
}
111112
}

0 commit comments

Comments
 (0)