feat: event queue connection

src/connection.ts

@@ -102,6 +102,13 @@ abstract class Connection extends EventEmitter {
     this.emit('state', state);
   }
 
+  /**
+   * Some connection managers may need to run some action when the wallet is ready.
+   */
+  notifyWalletReady() {
+    return;
+  }
+
   /**
    * Connect to the server and start emitting events.
    **/

src/models/output.ts

@@ -20,7 +20,7 @@ import ScriptData from './script_data'
 import Network from './network'
 import { bytesToOutputValue, unpackLen, unpackToInt, intToBytes, signedIntToBytes } from '../utils/buffer';
 import { prettyValue } from '../utils/numbers';
-import {parseP2PKH, parseP2SH, parseScriptData} from '../utils/scripts'
+import {parseP2PKH, parseP2SH, parseScriptData, parseScript} from '../utils/scripts'
 import _ from 'lodash'
 
 type optionsType = {
@@ -178,28 +178,8 @@ class Output {
     // we can keep throwing the error. Otherwise, we should just return null
     // because this method will be used together with others when we are trying to parse a given script.
 
-    try {
-      let parsedScript;
-      if (P2PKH.identify(this.script)) {
-        // This is a P2PKH script
-        parsedScript = parseP2PKH(this.script, network);
-      } else if (P2SH.identify(this.script)) {
-        // This is a P2SH script
-        parsedScript = parseP2SH(this.script, network);
-      } else {
-        // defaults to data script
-        parsedScript = parseScriptData(this.script);
-      }
-      this.decodedScript = parsedScript;
-      return parsedScript;
-    } catch (error) {
-      if (error instanceof ParseError) {
-        // We don't know how to parse this script
-        return null;
-      } else {
-        throw error;
-      }
-    }
+    this.decodedScript = parseScript(this.script, network);
+    return this.decodedScript;
   }
 
   /**

src/models/p2pkh.ts

@@ -10,6 +10,7 @@ import { util } from 'bitcore-lib';
 import { intToBytes } from '../utils/buffer';
 import helpers from '../utils/helpers';
 import Address from './address';
+import { IHistoryOutputDecoded } from '../types';
 
 type optionsType = {
   timelock?: number | null | undefined,
@@ -75,6 +76,19 @@ class P2PKH {
     return util.buffer.concat(arr);
   }
 
+  /**
+   * Get decoded output.
+   *
+   * @return {IHistoryOutputDecoded}
+   */
+  getDecoded(): IHistoryOutputDecoded {
+    return {
+      type: this.getType(),
+      address: this.address.base58,
+      timelock: this.timelock,
+    }
+  }
+
   /**
    * Identify a script as P2PKH or not.
    *

src/models/p2sh.ts

@@ -10,6 +10,7 @@ import { util } from 'bitcore-lib';
 import helpers from '../utils/helpers';
 import { intToBytes } from '../utils/buffer';
 import Address from './address';
+import { IHistoryOutputDecoded } from '../types';
 
 type optionsType = {
   timelock?: number | null | undefined,
@@ -71,6 +72,19 @@ class P2SH {
     return util.buffer.concat(arr);
   }
 
+  /**
+   * Get decoded output.
+   *
+   * @return {IHistoryOutputDecoded}
+   */
+  getDecoded(): IHistoryOutputDecoded {
+    return {
+      type: this.getType(),
+      address: this.address.base58,
+      timelock: this.timelock,
+    }
+  }
+
   /**
    * Identify a script as P2SH or not.
    *

src/models/script_data.ts

@@ -9,6 +9,7 @@ import { OP_CHECKSIG } from '../opcodes';
 import { util } from 'bitcore-lib';
 import helpers from '../utils/helpers';
 import buffer from 'buffer';
+import { IHistoryOutputDecoded } from '../types';
 
 class ScriptData {
   // String of data to store on the script
@@ -25,11 +26,11 @@ class ScriptData {
   /**
    * Get script type
    *
-   * @return {String}
+   * @return {string}
    * @memberof ScriptData
    * @inner
    */
-  getType(): String {
+  getType(): 'data' {
     return 'data';
   }
 
@@ -47,6 +48,18 @@ class ScriptData {
     arr.push(OP_CHECKSIG);
     return util.buffer.concat(arr);
   }
+
+  /**
+   * Get decoded output.
+   *
+   * @return {IHistoryOutputDecoded}
+   */
+  getDecoded(): IHistoryOutputDecoded {
+    return {
+      type: this.getType(),
+      data: this.data,
+    }
+  }
 }
 
 export default ScriptData;

src/new/connection.ts

@@ -97,12 +97,4 @@ class WalletConnection extends BaseConnection {
   }
 }
 
-// TODO: This is to maintain compatibility until we migrate to typescript
-// @ts-ignore
-WalletConnection.CLOSED = 0;
-// @ts-ignore
-WalletConnection.CONNECTING = 1;
-// @ts-ignore
-WalletConnection.CONNECTED = 2;
-
 export default WalletConnection;