Merge pull request #736 from syscoin/develop

update keyring fix verify address

Author: lucasgabrielgsp

manifest.json

@@ -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",
@@ -82,4 +83,4 @@
       }
     }
   }
-}
+}

package.json

@@ -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",

source/components/Header/AccountHeader.tsx

@@ -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
       );

source/config/consts.js

@@ -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',

source/scripts/Background/controllers/MainController.ts

@@ -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);
   }

yarn.lock

@@ -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"