@multiplechain/bitcoin 0.1.12 → 0.1.14

package/package.json

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

package/src/adapters/leather.js

@@ -1,4 +1,4 @@
-module.exports = leather = (provider) => {
+module.exports = (provider) => {
 
     if (window.crypto && !window.crypto.randomUUID) {
         window.crypto.randomUUID = () => {
@@ -70,6 +70,6 @@ module.exports = leather = (provider) => {
         supports: ['browser'],
         connect,
         download: 'https://leather.io/install-extension',
-        detected: Boolean(typeof window.LeatherProvider !== 'undefined')
+        isDetected: () => Boolean(typeof window.LeatherProvider !== 'undefined')
     }
 }

package/src/adapters/trustwallet.js

@@ -0,0 +1,32 @@
+module.exports = (provider) => {
+    
+    const wallet = window?.trustwallet?.bitcoin;
+
+    const connect = async () => {
+        return new Promise(async (resolve, reject) => {
+            try {
+                wallet.requestAccounts()
+                .then(async () => {
+                    resolve(wallet);
+                })
+                .catch(error => {
+                    reject(error);
+                });
+            } catch (error) {
+                reject(error);
+            }
+        });
+    }
+
+    return {
+        key: 'trustwallet',
+        name: 'Trust Wallet',
+        supports: [
+            'browser',
+            'mobile'
+        ],
+        connect,
+        download: 'https://trustwallet.com/download',
+        isDetected : () => Boolean(window?.trustwallet?.bitcoin?.isTrust)
+    }
+}

package/src/adapters/unisat.js

@@ -1,4 +1,4 @@
-module.exports = unisat = (provider) => {
+module.exports = (provider) => {
     
     const wallet = window.unisat;
     const network =  provider.testnet ? 'testnet' : 'livenet';
@@ -35,6 +35,6 @@ module.exports = unisat = (provider) => {
         supports: ['browser'],
         connect,
         download: 'https://unisat.io/download',
-        detected: Boolean(typeof window.unisat !== 'undefined' && window.unisat.requestAccounts)
+        isDetected: () => Boolean(typeof window.unisat !== 'undefined' && window.unisat.requestAccounts)
     }
 }

package/src/adapters/xverse.js

@@ -1,6 +1,6 @@
 const {getAddress, sendBtcTransaction, BitcoinNetworkType} = require('sats-connect');
 
-module.exports = xverse = (provider) => {
+module.exports = (provider) => {
     
     const type = provider.testnet ? 
                     BitcoinNetworkType.Testnet: 
@@ -81,6 +81,6 @@ module.exports = xverse = (provider) => {
         ],
         connect,
         download: 'https://www.xverse.app/download',
-        detected: Boolean(typeof window.XverseProviders !== 'undefined' && XverseProviders.BitcoinProvider)
+        isDetected: () => Boolean(typeof window.XverseProviders !== 'undefined' && XverseProviders.BitcoinProvider)
     }
 }

package/src/get-adapter.js

@@ -2,6 +2,7 @@ const adapters = {
     unisat: require('./adapters/unisat'),
     xverse: require('./adapters/xverse'),
     leather: require('./adapters/leather'),
+    trustwallet: require('./adapters/trustwallet'),
 }
 
 /**

package/src/provider.js

@@ -41,7 +41,7 @@ class Provider {
     /**
      * @var {Object}
      */
-    detectedWallets = [];
+    supportedWallets = {};
 
     /**
      * @var {Object}
@@ -77,7 +77,7 @@ class Provider {
             }
         }
 
-        this.detectWallets();
+        this.initSupportedWallets();
     }
 
     getWalletOpenLink(address, amount) {
@@ -159,8 +159,9 @@ class Provider {
      */
     connectWallet(adapter) {
         return new Promise(async (resolve, reject) => {
-            if (this.detectedWallets[adapter]) {
-                let wallet = this.detectedWallets[adapter];
+            let detectedWallets = this.getDetectedWallets();
+            if (detectedWallets[adapter]) {
+                let wallet = detectedWallets[adapter];
                 wallet.connect()
                 .then(() => {
                     resolve(wallet);
@@ -175,50 +176,39 @@ class Provider {
     }
 
     /**
-     * @param {Array|null} filter 
-     * @returns {Array}
+     * @returns {void}
      */
-    getSupportedWallets(filter) {
-        
+    initSupportedWallets() {
         const Wallet = require('./wallet');
 
-        const wallets = {
+        this.supportedWallets = {
             unisat: new Wallet('unisat', this),
             xverse: new Wallet('xverse', this),
             leather: new Wallet('leather', this),
+            trustwallet: new Wallet('trustwallet', this),
         };
         
-        return Object.fromEntries(Object.entries(wallets).filter(([key]) => {
-            return !filter ? true : filter.includes(key);
-        }));
     }
 
     /**
      * @param {Array|null} filter 
      * @returns {Array}
      */
-    getDetectedWallets(filter) {
-        return Object.fromEntries(Object.entries(this.detectedWallets).filter(([key]) => {
+    getSupportedWallets(filter) {
+        return Object.fromEntries(Object.entries(this.supportedWallets).filter(([key]) => {
             return !filter ? true : filter.includes(key);
         }));
     }
 
-    detectWallets() {
-        if (typeof window != 'undefined') {
-            const Wallet = require('./wallet');
-
-            if (typeof window.unisat !== 'undefined' && unisat.requestAccounts) {
-                this.detectedWallets['unisat'] = new Wallet('unisat', this);
-            }
-
-            if (typeof window.XverseProviders !== 'undefined' && XverseProviders.BitcoinProvider) {
-                this.detectedWallets['xverse'] = new Wallet('xverse', this);
-            }
-
-            if (typeof window.LeatherProvider !== 'undefined') {
-                this.detectedWallets['leather'] = new Wallet('leather', this);
-            }
-        }
+    /**
+     * @param {Array|null} filter 
+     * @returns {Array}
+     */
+    getDetectedWallets(filter) {
+        let detectedWallets = this.getSupportedWallets(filter);
+        return Object.fromEntries(Object.entries(detectedWallets).filter(([key, value]) => {
+            return value.isDetected() == undefined ? true : value.isDetected()
+        }));
     }
 
     Coin() {

package/src/wallet.js

@@ -78,7 +78,7 @@ class Wallet {
      * @returns {Boolean}
      */
     isDetected() {
-        return this.adapter.detected;
+        return this.adapter.isDetected();
     }
 
     /**