From 64eba761c8d7b39e2fbb1ca5c8f43d725c7c99bf Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Thu, 9 Jul 2020 13:42:07 +0200
Subject: [PATCH] sdk38: Remove enabling from secp256k1 offline wallet

---
 packages/sdk38/src/wallet.spec.ts | 13 -------------
 packages/sdk38/src/wallet.ts      | 15 ---------------
 packages/sdk38/types/wallet.d.ts  |  5 -----
 3 files changed, 33 deletions(-)

diff --git a/packages/sdk38/src/wallet.spec.ts b/packages/sdk38/src/wallet.spec.ts
index fc689417..bb1b1d18 100644
--- a/packages/sdk38/src/wallet.spec.ts
+++ b/packages/sdk38/src/wallet.spec.ts
@@ -16,12 +16,6 @@ describe("Secp256k1OfflineWallet", () => {
   });
 
   describe("getAccounts", () => {
-    it("rejects if not enabled", async () => {
-      const wallet = await Secp256k1OfflineWallet.fromMnemonic(defaultMnemonic);
-      spyOn(wallet as any, "enable").and.resolveTo(false);
-      await expectAsync(wallet.getAccounts()).toBeRejectedWithError(/wallet not enabled/i);
-    });
-
     it("resolves to a list of accounts if enabled", async () => {
       const wallet = await Secp256k1OfflineWallet.fromMnemonic(defaultMnemonic);
       const accounts = await wallet.getAccounts();
@@ -43,13 +37,6 @@ describe("Secp256k1OfflineWallet", () => {
   });
 
   describe("sign", () => {
-    it("rejects if not enabled", async () => {
-      const wallet = await Secp256k1OfflineWallet.fromMnemonic(defaultMnemonic);
-      spyOn(wallet as any, "enable").and.resolveTo(false);
-      const message = toAscii("foo bar");
-      await expectAsync(wallet.sign(defaultAddress, message)).toBeRejectedWithError(/wallet not enabled/i);
-    });
-
     it("resolves to valid signature if enabled", async () => {
       const wallet = await Secp256k1OfflineWallet.fromMnemonic(defaultMnemonic);
       const message = toAscii("foo bar");
diff --git a/packages/sdk38/src/wallet.ts b/packages/sdk38/src/wallet.ts
index bddbfabd..1bf42fc8 100644
--- a/packages/sdk38/src/wallet.ts
+++ b/packages/sdk38/src/wallet.ts
@@ -79,7 +79,6 @@ export class Secp256k1OfflineWallet implements OfflineSigner {
   private readonly privkey: Uint8Array;
   private readonly prefix: string;
   private readonly algo: Algo = "secp256k1";
-  private enabled = false;
 
   private constructor(privkey: Uint8Array, pubkey: Uint8Array, prefix: string) {
     this.privkey = privkey;
@@ -91,18 +90,7 @@ export class Secp256k1OfflineWallet implements OfflineSigner {
     return rawSecp256k1PubkeyToAddress(this.pubkey, this.prefix);
   }
 
-  /**
-   * Request access to the user's accounts. Some wallets will ask the user to approve or deny access. Returns true if granted access or false if denied.
-   */
-  private async enable(): Promise<boolean> {
-    this.enabled = true;
-    return this.enabled;
-  }
-
   public async getAccounts(): Promise<readonly AccountData[]> {
-    if (!this.enabled && !(await this.enable())) {
-      throw new Error("Wallet not enabled");
-    }
     return [
       {
         address: this.address,
@@ -117,9 +105,6 @@ export class Secp256k1OfflineWallet implements OfflineSigner {
     message: Uint8Array,
     prehashType: PrehashType = "sha256",
   ): Promise<StdSignature> {
-    if (!this.enabled && !(await this.enable())) {
-      throw new Error("Wallet not enabled");
-    }
     if (address !== this.address) {
       throw new Error(`Address ${address} not found in wallet`);
     }
diff --git a/packages/sdk38/types/wallet.d.ts b/packages/sdk38/types/wallet.d.ts
index 57a3e919..27c5bcad 100644
--- a/packages/sdk38/types/wallet.d.ts
+++ b/packages/sdk38/types/wallet.d.ts
@@ -32,13 +32,8 @@ export declare class Secp256k1OfflineWallet implements OfflineSigner {
   private readonly privkey;
   private readonly prefix;
   private readonly algo;
-  private enabled;
   private constructor();
   private get address();
-  /**
-   * Request access to the user's accounts. Some wallets will ask the user to approve or deny access. Returns true if granted access or false if denied.
-   */
-  private enable;
   getAccounts(): Promise<readonly AccountData[]>;
   sign(address: string, message: Uint8Array, prehashType?: PrehashType): Promise<StdSignature>;
 }