Skip to content

Commit 37049cf

Browse files
committed
Support Onekey Wallet,Fix display issue,Optimize UI
1 parent c67199b commit 37049cf

23 files changed

+472
-240
lines changed

package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "kasware-extension",
3-
"version": "0.2.8.5",
3+
"version": "0.3.0",
44
"private": true,
55
"homepage": "https://github.com/kasware-wallet/extension#readme",
66
"bugs": {
@@ -18,14 +18,13 @@
1818
"build:brave": "gulp build --env=pro --browser=brave --manifest=mv2 --channel=github",
1919
"build:edge": "gulp build --env=pro --browser=edge --manifest=mv2 --channel=github",
2020
"build:chrome:mv3:dev": "webpack --progress --env browser=chrome manifest=mv3 config=dev channel=github version=0.0.0",
21-
"build:chrome:mv3": "gulp build --env=pro --browser=chrome --manifest=mv3 --channel=store",
21+
"build:chrome:mv3": "rm -rf dist/* && pnpm install && gulp build --env=pro --browser=chrome --manifest=mv3 --channel=store",
2222
"translate": "node build/pull_translation",
2323
"lint": "eslint src --fix --ext .js,.ts,.tsx,.json && npm run format",
2424
"lint:fix": "eslint --fix src/**/*.{js,jsx,ts,tsx,json}",
2525
"_prettier": "prettier --write .",
2626
"fix:modules": "node scripts/fix-modules.js",
27-
"format": "prettier --write \"src/**/*.{js,jsx,json,md,ts,tsx}\" --plugin-search-dir=./node_modules/ --plugin=./node_modules/@trivago/prettier-plugin-sort-imports/ ",
28-
"prepare": "npm run fix:modules"
27+
"format": "prettier --write \"src/**/*.{js,jsx,json,md,ts,tsx}\" --plugin-search-dir=./node_modules/ --plugin=./node_modules/@trivago/prettier-plugin-sort-imports/ "
2928
},
3029
"dependencies": {
3130
"@ant-design/icons": "^4.7.0",
@@ -37,6 +36,8 @@
3736
"@fortawesome/react-fontawesome": "^0.1.18",
3837
"@kaspa/wallet": "^1.4.26",
3938
"@metamask/obs-store": "^7.0.0",
39+
"@noble/hashes": "^1.4.0",
40+
"@noble/secp256k1": "1.7.1",
4041
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
4142
"@reduxjs/toolkit": "^1.9.2",
4243
"@sentry/browser": "^6.19.7",
@@ -63,6 +64,7 @@
6364
"bfj": "^7.0.2",
6465
"bignumber.js": "^9.1.1",
6566
"bip39": "^3.1.0",
67+
"bitcoinjs-lib": "^6.1.5",
6668
"bitcore-lib": "^10.0.23",
6769
"browser-passworder": "^2.0.3",
6870
"browserify": "^17.0.0",
@@ -274,4 +276,4 @@
274276
]
275277
},
276278
"__npminstall_done": false
277-
}
279+
}

pnpm-lock.yaml

Lines changed: 55 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release-notes.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# KasWare Wallet Release Notes
22

3+
## v0.3.0
4+
5+
- Support Onekey Wallet
6+
- Fix display issue
7+
- Optimize UI
8+
39
## v0.2.8
410

511
- Fixed scan more addresses issue

src/background/controller/wallet.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,8 @@ export class WalletController extends BaseController {
321321
activeIndexes,
322322
activeChangeIndexes: accountCount > 1 ? activeIndexes : [],
323323
hdPath,
324-
passphrase
324+
passphrase,
325+
addressType
325326
});
326327
const displayedKeyring = await keyringService.displayForKeyring(originKeyring, addressType, -1);
327328
return this.displayedKeyringToWalletKeyring(displayedKeyring, -1, false);
@@ -343,7 +344,8 @@ export class WalletController extends BaseController {
343344
activeIndexes,
344345
activeChangeIndexes: accountCount > 1 ? activeIndexes : [],
345346
hdPath,
346-
passphrase
347+
passphrase,
348+
addressType
347349
});
348350
const address_arr_final: string[] = [];
349351
const satoshis_arr_final: number[] = [];

src/background/service/keyring/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@ class KeyringService extends EventEmitter {
297297
activeIndexes,
298298
activeChangeIndexes,
299299
hdPath,
300-
passphrase
300+
passphrase,
301+
addressType
301302
},
302303
addressType
303304
);

0 commit comments

Comments
 (0)