Merge branch 'main' into feat/mv3-migration

pollum-io · Aug 29, 2024 · 3578615 · 3578615
2 parents a5b6957 + 6c1926e
commit 3578615
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 79 deletions.
diff --git a/packages/sysweb3-keyring/package.json b/packages/sysweb3-keyring/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pollum-io/sysweb3-keyring",
-  "version": "1.0.478",
+  "version": "1.0.479",
   "description": "Keyring Manager for UTXO and Web3 Wallets",
   "main": "cjs/index.js",
   "types": "types/index.d.ts",

diff --git a/packages/sysweb3-keyring/src/initial-state.ts b/packages/sysweb3-keyring/src/initial-state.ts
@@ -41,11 +41,11 @@ export const initialNetworksState = {
     57: {
       chainId: 57,
       label: 'Syscoin Mainnet',
-      url: 'https://blockbook.elint.services/',
+      url: 'https://blockbook.syscoin.org',
       default: true,
       currency: 'sys',
       apiUrl: '',
-      explorer: 'https://blockbook.elint.services/',
+      explorer: 'https://blockbook.syscoin.org',
       slip44: 57,
       isTestnet: false,
     },

diff --git a/packages/sysweb3-keyring/src/transactions/syscoin.ts b/packages/sysweb3-keyring/src/transactions/syscoin.ts
@@ -737,12 +737,14 @@ export class SyscoinTransactions implements ISyscoinTransactions {
   public signPSBT = async ({
     psbt,
     signer,
+    pathIn,
   }: {
     psbt: string;
     signer: any;
+    pathIn?: string;
   }): Promise<JSON> => {
     return sys.utils.exportPsbtToJson(
-      await signer.sign(psbt),
+      await signer.sign(psbt, pathIn),
       undefined
     ) as any;
   };
@@ -770,7 +772,8 @@ export class SyscoinTransactions implements ISyscoinTransactions {
 
   signTransaction = async (
     data: { psbt: string; assets: string },
-    isSignOnly: boolean
+    isSignOnly: boolean,
+    pathIn?: string
   ): Promise<any> => {
     const { hd } = this.getSigner();
 
@@ -792,6 +795,7 @@ export class SyscoinTransactions implements ISyscoinTransactions {
         return await this.signPSBT({
           psbt: response.psbt,
           signer: hd,
+          pathIn,
         });
       }
 

diff --git a/packages/sysweb3-keyring/src/types.ts b/packages/sysweb3-keyring/src/types.ts
@@ -173,7 +173,7 @@ export interface ISyscoinTransactions {
   signTransaction: (
     data: { psbt: string; assets: string },
     isSendOnly: boolean,
-    isTrezor?: boolean
+    pathIn?: string
   ) => Promise<any>;
 }