Merge pull request #74 from CityOfZion/CU-86du15m7h-6

CU-86du15m7h - Plan, Structure and Implement BsLib support to multich…
CityOfZion · Jul 18, 2024 · 49591fd · 49591fd
2 parents 7ca6b6b + 7062234
commit 49591fd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/common/changes/@cityofzion/bs-ethereum/CU-86du15m7h-6_2024-07-18-00-38.json b/common/changes/@cityofzion/bs-ethereum/CU-86du15m7h-6_2024-07-18-00-38.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@cityofzion/bs-ethereum",
+      "comment": "Fix for EthersLedgerSigner instantiation",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@cityofzion/bs-ethereum"
+}
diff --git a/packages/bs-ethereum/src/BSEthereum.ts b/packages/bs-ethereum/src/BSEthereum.ts
@@ -21,7 +21,7 @@ import { BitqueryEDSEthereum } from './BitqueryEDSEthereum'
 import { GhostMarketNDSEthereum } from './GhostMarketNDSEthereum'
 import { RpcBDSEthereum } from './RpcBDSEthereum'
 import { BitqueryBDSEthereum } from './BitqueryBDSEthereum'
-import { EthersLedgerServiceEthereum, EthersLedgerSigner } from './EthersLedgerServiceEthereum'
+import { EthersLedgerServiceEthereum } from './EthersLedgerServiceEthereum'
 import Transport from '@ledgerhq/hw-transport'
 import { BSEthereumNetworkId, BSEthereumHelper } from './BSEthereumHelper'
 
@@ -161,7 +161,7 @@ export class BSEthereum<BSCustomName extends string = string>
 
     let signer: ethers.Signer
     if (ledgerTransport) {
-      signer = new EthersLedgerSigner(ledgerTransport, provider)
+      signer = this.ledgerService.getSigner(ledgerTransport, provider)
     } else {
       signer = new ethers.Wallet(param.senderAccount.key, provider)
     }
@@ -202,7 +202,7 @@ export class BSEthereum<BSCustomName extends string = string>
 
     let signer: ethers.Signer
     if (ledgerTransport) {
-      signer = new EthersLedgerSigner(ledgerTransport, provider)
+      signer = this.ledgerService.getSigner(ledgerTransport, provider)
     } else {
       signer = new ethers.Wallet(param.senderAccount.key, provider)
     }

diff --git a/packages/bs-ethereum/src/EthersLedgerServiceEthereum.ts b/packages/bs-ethereum/src/EthersLedgerServiceEthereum.ts
@@ -182,17 +182,17 @@ export class EthersLedgerServiceEthereum implements LedgerService {
   constructor(public getLedgerTransport?: (account: Account) => Promise<Transport>) {}
 
   async getAddress(transport: Transport): Promise<string> {
-    const signer = new EthersLedgerSigner(transport)
+    const signer = this.getSigner(transport)
     return await signer.getAddress()
   }
 
   async getPublicKey(transport: Transport): Promise<string> {
-    const signer = new EthersLedgerSigner(transport)
+    const signer = this.getSigner(transport)
     return await signer.getPublicKey()
   }
 
-  getSigner(transport: Transport): EthersLedgerSigner {
-    return new EthersLedgerSigner(transport, undefined, this.emitter)
+  getSigner(transport: Transport, provider?: ethers.providers.Provider): EthersLedgerSigner {
+    return new EthersLedgerSigner(transport, provider, this.emitter)
   }
 }