@multiplechain/bitcoin 0.1.4 → 0.1.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "namespace": "multiplechain",
   "name": "@multiplechain/bitcoin",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Bitcoin JS provider",
   "scripts": {
     "serve": "parcel test.html --no-cache --dist-dir test",

package/src/adapters/unisat.js

@@ -27,9 +27,10 @@ module.exports = unisat = (provider) => {
     return {
         key: 'unisat',
         name: 'UniSat',
-        type: 'browser',
+        supports: ['browser'],
         wallet,
         connect,
-        download: 'https://unisat.io/download'
+        download: 'https://unisat.io/download',
+        detected: Boolean(typeof window.unisat !== 'undefined' && window.unisat.requestAccounts)
     }
 }

package/src/provider.js

@@ -44,9 +44,13 @@ class Provider {
      */
     connectedWallet;
 
-    constructor(testnet = false) {
-        this.testnet = testnet;
-        this.network = testnet ? 'testnet' : 'livenet';
+    /**
+     * @param {Object} options 
+     */
+    constructor(options) {
+        
+        this.testnet = options.testnet;
+        this.network = options.testnet ? 'testnet' : 'livenet';
 
         if (!this.testnet) {
             this.api = "https://blockstream.info/api/";
@@ -65,32 +69,6 @@ class Provider {
         return 'bitcoin' + ':' + String(address).toUpperCase() + '?amount=' + amount;
     }
 
-    errorCheck(data) {
-        if (typeof data == 'string') {
-            if (data == 'Address on invalid network') {
-                return {
-                    error: 'invalid-address'
-                }
-            } else {
-                return {
-                    error: 'any-error'
-                }
-            }
-        } else if (data.error) {
-            if (data.error == 'not-found-or-invalid-arg') {
-                return {
-                    error: 'invalid-address'
-                }
-            } else {
-                return {
-                    error: 'any-error'
-                }
-            }
-        }
-
-        return data;
-    }
-
     listenTransactions(options, callback) {
         let receiver = options.receiver;
         let ws = new WebSocket(this.wsUrl);
@@ -152,13 +130,29 @@ class Provider {
     }
 
     /**
-     * @param {Array} filter 
+     * @param {Array|null} filter 
+     * @returns {Array}
+     */
+    getSupportedWallets(filter) {
+        
+        const Wallet = require('./wallet');
+
+        const wallets = {
+            unisat: new Wallet('unisat', this)
+        };
+        
+        return Object.fromEntries(Object.entries(wallets).filter(([key]) => {
+            return !filter ? true : filter.includes(key);
+        }));
+    }
+
+    /**
+     * @param {Array|null} filter 
      * @returns {Array}
      */
     getDetectedWallets(filter) {
-        if (!filter) return this.detectedWallets;
         return Object.fromEntries(Object.entries(this.detectedWallets).filter(([key]) => {
-            return filter.includes(key);
+            return !filter ? true : filter.includes(key);
         }));
     }
 

package/src/wallet.js

@@ -57,8 +57,8 @@ class Wallet {
     /**
      * @returns {String}
      */
-    getType() {
-        return this.adapter.type;
+    getSupports() {
+        return this.adapter.supports;
     }
 
     /**
@@ -75,21 +75,18 @@ class Wallet {
         return this.adapter.download;
     }
 
+    /**
+     * @returns {Boolean}
+     */
+    isDetected() {
+        return this.adapter.detected;
+    }
+
     /**
      * @returns {String}
      */
     connect() {
         return new Promise((resolve, reject) => {
-            let time = 0;
-            let timeout = 15;
-            let timer = setInterval(async () => {
-                time += 1;
-                if (time > timeout) {
-                    clearInterval(timer);
-                    reject('timeout');
-                }
-            }, 1000);
-
             this.adapter.connect()
             .then(async (connectedAccount) => {
                 let network = await this.wallet.getNetwork();
@@ -102,9 +99,6 @@ class Wallet {
             })
             .catch((error) => {
                 utils.rejectMessage(error, reject);
-            })
-            .finally(() => {
-                clearInterval(timer);
             });
         });
     }