DEXW-5017: wavesLedger instance (#97)

* DEXW-5017: wavesLedger instance * 6.1.4 * 6.1.5 Co-authored-by: okanishcheva <[email protected]> Co-authored-by: vba2000 <[email protected]>
wavesplatform · May 4, 2022 · 8f34200 · 8f34200
1 parent 77eee4a
commit 8f34200
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@waves/signature-adapter",
-  "version": "6.1.3",
+  "version": "6.1.5",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "license": "MIT",

diff --git a/src/adapters/LedgerAdapter.ts b/src/adapters/LedgerAdapter.ts
@@ -13,7 +13,7 @@ export class LedgerAdapter extends Adapter {
     private static _ledger: WavesLedger;
     //@ts-ignore
     private static _hasConnectionPromise;
-
+    private static _wavesLedgerOptions: IWavesLedger;
 
     //@ts-ignore
     constructor(user) {
@@ -52,20 +52,20 @@ export class LedgerAdapter extends Adapter {
     }
 
     public getAdapterVersion() {
-        return LedgerAdapter._ledger.getVersion();
+        return LedgerAdapter.getLedgerInstance().getVersion();
     }
 
     public signRequest(bytes: Uint8Array): Promise<string> {
         return  this._isMyLedger()
-            .then(() => LedgerAdapter._ledger.signRequest(this._currentUser.id, { dataBuffer: bytes }));
+            .then(() => LedgerAdapter.getLedgerInstance().signRequest(this._currentUser.id, { dataBuffer: bytes }));
     }
 
     public signTransaction(bytes: Uint8Array, precision: Record<string, number>, signData: any): Promise<string> {
         if (bytes[0] === 15) {
             return this.signData(bytes);
         }
         return this._isMyLedger()
-            .then(() => LedgerAdapter._ledger.signTransaction(
+            .then(() => LedgerAdapter.getLedgerInstance().signTransaction(
                 this._currentUser.id, {
                     amount2Precision: precision.amount2Precision,
                     amountPrecision: precision.amountPrecision,
@@ -78,7 +78,7 @@ export class LedgerAdapter extends Adapter {
 
     public signOrder(bytes: Uint8Array, precision: Record<string, number>, data: any): Promise<string> {
         return this._isMyLedger()
-            .then(() => LedgerAdapter._ledger.signOrder(this._currentUser.id, {
+            .then(() => LedgerAdapter.getLedgerInstance().signOrder(this._currentUser.id, {
                 dataBuffer: bytes,
                 amountPrecision: precision.amountPrecision,
                 feePrecision: precision.feePrecision,
@@ -88,7 +88,7 @@ export class LedgerAdapter extends Adapter {
 
     public signData(bytes: Uint8Array): Promise<string> {
         return this._isMyLedger()
-            .then(() => LedgerAdapter._ledger.signSomeData(this._currentUser.id, { dataBuffer: bytes }));
+            .then(() => LedgerAdapter.getLedgerInstance().signSomeData(this._currentUser.id, { dataBuffer: bytes }));
     }
 
     public getEncodedSeed() {
@@ -126,7 +126,7 @@ export class LedgerAdapter extends Adapter {
     }
 
     protected _isMyLedger() {
-        const promise = LedgerAdapter._ledger.getUserDataById(this._currentUser.id)
+        const promise = LedgerAdapter.getLedgerInstance().getUserDataById(this._currentUser.id)
             //@ts-ignore
             .then(user => {
                 if (user.address !== this._currentUser.address) {
@@ -143,17 +143,17 @@ export class LedgerAdapter extends Adapter {
     }
 
     public static getUserList(from: number = 1, to: number = 1) {
-        return LedgerAdapter._ledger.getPaginationUsersData(from, to) as any;
+        return LedgerAdapter.getLedgerInstance().getPaginationUsersData(from, to) as any;
     }
 
     public static initOptions(options: IWavesLedger) {
         Adapter.initOptions(options);
-        this._ledger = new WavesLedger( options );
+        LedgerAdapter._wavesLedgerOptions = options;
     }
 
     public static isAvailable() {
         if (!LedgerAdapter._hasConnectionPromise) {
-            LedgerAdapter._hasConnectionPromise = LedgerAdapter._ledger.probeDevice();
+            LedgerAdapter._hasConnectionPromise = LedgerAdapter.getLedgerInstance().probeDevice();
         }
 
         return LedgerAdapter._hasConnectionPromise.then(() => {
@@ -165,6 +165,13 @@ export class LedgerAdapter extends Adapter {
             return false;
         });
     }
+
+    protected static getLedgerInstance(): WavesLedger {
+        if (!LedgerAdapter._ledger) {
+            LedgerAdapter._ledger = new WavesLedger(LedgerAdapter._wavesLedgerOptions);
+        }
+        return LedgerAdapter._ledger;
+    }
 }
 
 interface IWavesLedger  {