Skip to content

update keyring fix verify address #736

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

Merged
lucasgabrielgsp merged 4 commits into from
Sep 29, 2025
Merged

update keyring fix verify address #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9cf74a
fix verify utxo address
Sep 12, 2025
d3f4957
try to add all assets to manifest to pali logo shows up on wallet con…
Sep 25, 2025
039adb3
update keyring
Sep 25, 2025
98e6157
Merge branch 'master' into develop
lucasgabrielgsp Sep 29, 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
3 changes: 2 additions & 1 deletion manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"js/inpage.bundle.js",
"js/handleWindowProperties.bundle.js",
"js/pali.bundle.js",
"assets/all_assets/*",
"assets/all_assets/favicon-16.png",
"assets/all_assets/favicon-32.png",
"assets/all_assets/favicon-48.png",
Expand All @@ -82,4 +83,4 @@
}
}
}
}
}
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 @@ -63,7 +63,7 @@
"@heroicons/react": "^1.0.6",
"@reduxjs/toolkit": "^2.8.2",
"@sidhujag/sysweb3-core": "^1.0.27",
"@sidhujag/sysweb3-keyring": "^1.0.561",
"@sidhujag/sysweb3-keyring": "^1.0.563",
"@sidhujag/sysweb3-network": "^1.0.106",
"@sidhujag/sysweb3-utils": "^1.1.271",
"@tippyjs/react": "^4.2.6",
Expand Down
7 changes: 2 additions & 5 deletions source/components/Header/AccountHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,9 @@ export const AccountHeader: React.FC = () => {
try {
setIsLoading(true);

// Determine which hardware wallet type to use
const signerType = isLedger ? 'ledgerSigner' : 'trezorSigner';

// Use type assertion for legacy controller methods
// Route through ethereumTransaction.verifyUtxoAddress, which dispatches to the correct HW
await (controllerEmitter as any)(
['wallet', signerType, 'utxo', 'verifyUtxoAddress'],
['wallet', 'ethereumTransaction', 'verifyUtxoAddress'],
[activeAccount?.id, activeNetwork.currency, activeNetwork.slip44],
300000 // 5 minutes timeout for hardware wallet operations
);
Expand Down
1 change: 1 addition & 0 deletions source/config/consts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ const MV3_OPTIONS = {
'js/inpage.bundle.js',
'js/handleWindowProperties.bundle.js',
'js/pali.bundle.js',
'assets/all_assets/*',
'assets/all_assets/favicon-16.png',
'assets/all_assets/favicon-32.png',
'assets/all_assets/favicon-48.png',
Expand Down
8 changes: 0 additions & 8 deletions source/scripts/Background/controllers/MainController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,14 +1185,6 @@ class MainController {
return (this.getActiveKeyring() as any).validateWif(wif, targetNetwork);
}

public get trezorSigner() {
return this.getActiveKeyring().trezorSigner;
}

public get ledgerSigner() {
return this.getActiveKeyring().ledgerSigner;
}

public getChangeAddress(id: number) {
return this.getActiveKeyring().getChangeAddress(id);
}
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2629,10 +2629,10 @@
resolved "https://registry.yarnpkg.com/@sidhujag/sysweb3-core/-/sysweb3-core-1.0.27.tgz#b7dd7d065c1845519e91ac470540ab94721eb33b"
integrity sha512-aeUJpk+DiziPJbD6HFnfixKZj0T4HYStshjk6+adziftLwamNc3MIp+MtIVZwtzvNpbzIXwAnuJM/QXQsc01NQ==

"@sidhujag/sysweb3-keyring@^1.0.561":
version "1.0.561"
resolved "https://registry.yarnpkg.com/@sidhujag/sysweb3-keyring/-/sysweb3-keyring-1.0.561.tgz#13f018f23ae89467976c79bb74eaf77b8e27578d"
integrity sha512-ZiUxk5s4FabqIzbXvyfX42ZpfYDKLXCdzbCufmHYIaVdlglg239ISagfj540Pm0UEBIADhb6YwsOEnyFXkLLEA==
"@sidhujag/sysweb3-keyring@^1.0.563":
version "1.0.563"
resolved "https://registry.yarnpkg.com/@sidhujag/sysweb3-keyring/-/sysweb3-keyring-1.0.563.tgz#98781aac4d28983c7e2767106566dc7796efbb3b"
integrity sha512-pRoGp3TPoWSeEuEqJZvuepCXp8/8cQY82EMH+xe4MxCgMj4J9mR++RIutVk/AnO7kYIXoNIGPqpw4Jvi8504bA==
dependencies:
"@bitcoinerlab/secp256k1" "^1.2.0"
"@ethersproject/abstract-provider" "^5.8.0"
Expand Down
Loading