Merge develop

Author: lnbc1QWFyb24

README.md

@@ -29,6 +29,8 @@ const onboard = Onboard.init({
   modules: {
     // default wallets that are included: MetaMask, Dapper, Coinbase, Trust, WalletConnect
     walletSelect: Onboard.modules.select.defaults({
+      // if you want squarelink as a wallet option
+      squarelinkInit: { apiKey: "Your squarelink key here" },
       // if you want fortmatic as a wallet option
       fortmaticInit: { apiKey: "Your fortmatic key here" },
       // if you want portis as a wallet option
@@ -88,7 +90,7 @@ const options = {
     address: Function, // Called with the current account address of the user [String]
     network: Function, // Called with the current network id the users' wallet is connected to [Number]
     balance: Function, // Called with the current balance in `wei` of the users' current account address [String]
-    wallet: Function // Called with the users' current selected wallet [Object]: {provider: Object, name: String}
+    wallet: Function // Called with the users' current selected wallet [Object]: {provider: Object, name: String, instance: Object (if a sdk wallet)}
   },
   modules: {
     walletSelect: {
@@ -176,6 +178,7 @@ The wallet select modules are functions that return a wallet object. The followi
 - `dapper`
 - `walletConnect` (requires initialization)
 - `portis` (requires initialization)
+- `squarelink` (requires initialization)
 - `fortmatic` (requires initialization)
 
 #### Mobile Wallets
@@ -184,6 +187,7 @@ The wallet select modules are functions that return a wallet object. The followi
 - `coinbase`
 - `walletConnect` (requires initialization)
 - `portis` (requires initialization)
+- `squarelink` (requires initialization)
 - `fortmatic` (requires initialization)
 
 `defaults` Initialization:
@@ -192,7 +196,8 @@ The wallet select modules are functions that return a wallet object. The followi
 modules.select.defaults({
   heading: String, // Override the default heading [optional]
   description: String, // Override the default description [optional]
-  networkId: Number, // Required if you want the Portis or Fortmatic modules to be included
+  networkId: Number, // Required if you want the Portis, Squarelink, or Fortmatic modules to be included
+  squarelinkInit: Object, // initialization object for Squarelink module (see below)
   portisInit: Object, // initialization object for Portis module (see below)
   fortmaticInit: Object // initialization object for Fortmatic module (see below)
 })
@@ -207,11 +212,20 @@ portis({
 })
 ```
 
+`squarelink` Initialization:
+
+```javascript
+squarelink({
+  apiKey: String, // your Squarelink api key
+  networkId: Number //  the networkId of the network you want to connect to
+})
+```
+
 `fortmatic` Initialization:
 
 ```javascript
 fortmatic({
-  apiKey: String, // your Portis api key
+  apiKey: String, // your Fortmatic api key
   networkId: Number //  the networkId of the network you want to connect to
 })
 ```
@@ -231,7 +245,13 @@ import Onboard from "bnc-onboard"
 
 // PICK AND CHOOSE MODULES
 
-const { portis, dapper, metamask, fortmatic } = Onboard.modules.select
+const {
+  portis,
+  squarelink,
+  dapper,
+  metamask,
+  fortmatic
+} = Onboard.modules.select
 
 const onboard = Onboard.init({
   // ...
@@ -242,11 +262,12 @@ const onboard = Onboard.init({
         "Please select the wallet that you would like to use with this Dapp",
       wallets: {
         desktop: [
-          portis({ apiKey: 'sdda-w2-ds3', networkId: 1 })
+          portis({ apiKey: "sdda-w2-ds3", networkId: 1 }),
+          squarelink({ apiKey: "sdda-w2-ds3", networkId: 1 }),
           dapper(),
-          metmask(),
+          metmask()
         ],
-        mobile: [fortmatic({apiKey: 'sd-3d3-d', networkId: 1})]
+        mobile: [fortmatic({ apiKey: "sd-3d3-d", networkId: 1 })]
       }
     }
     //....
@@ -263,7 +284,7 @@ const onboard = Onboard.init({
     walletSelect: Onboard.modules.select.defaults({
       portisInit: { apiKey: "Your portis key here" },
       networkId: 4
-    }),
+    })
     // ...
   }
 })

package.json

@@ -26,16 +26,17 @@
     "babel-plugin-external-helpers": "^6.18.0"
   },
   "dependencies": {
+    "@portis/web3": "^2.0.0-beta.42",
+    "@walletconnect/web3-provider": "^1.0.0-beta.36",
     "bignumber.js": "^9.0.0",
     "bnc-sdk": "0.1.1",
     "bowser": "^2.5.2",
+    "fortmatic": "^0.8.2",
     "promise-cancelable": "^2.1.1",
     "regenerator-runtime": "^0.13.3",
+    "squarelink": "^1.1.3",
     "svelte": "^3.0.0",
-    "svelte-i18n": "^1.1.2-beta",
-    "@portis/web3": "^2.0.0-beta.42",
-    "@walletconnect/web3-provider": "^1.0.0-beta.36",
-    "fortmatic": "^0.8.2"
+    "svelte-i18n": "^1.1.2-beta"
   },
   "scripts": {
     "prepare": "rollup -c",

rollup.config.js

@@ -45,11 +45,12 @@ export default [
       "svelte/store",
       "svelte/internal",
       "svelte/transition",
+      "squarelink",
       "promise-cancelable",
       "regenerator-runtime/runtime",
       "@portis/web3",
       "@walletconnect/web3-provider",
-      "fortmatic"
+      "fortmatic",
     ],
     plugins: [
       svelte(),

src/modules/select/index.js

@@ -5,13 +5,15 @@ import coinbase from "./wallets/coinbase"
 import trust from "./wallets/trust"
 import portis from "./wallets/portis"
 import fortmatic from "./wallets/fortmatic"
+import squarelink from "./wallets/squarelink"
 
 function defaults({
   heading,
   description,
   networkId,
   fortmaticInit,
   portisInit,
+  squarelinkInit,
   walletConnectInit
 }) {
   const desktopModules = [metamask(), dapper()]
@@ -36,6 +38,11 @@ function defaults({
     )
   }
 
+  if (squarelinkInit) {
+    desktopModules.push(squarelink({ ...squarelinkInit, networkId }))
+    mobileModules.push(squarelink({ ...squarelinkInit, networkId }))
+  }
+
   return {
     heading: heading || "Select a Wallet",
     description:
@@ -56,5 +63,6 @@ export default {
   coinbase,
   trust,
   portis,
-  fortmatic
+  fortmatic,
+  squarelink
 }

src/modules/select/wallet-icons/icon-squarelink.svg

@@ -15,17 +15,18 @@ function fortmatic(options) {
     name: "Fortmatic",
     iconSrc: fortmaticIcon,
     wallet: ({ BigNumber }) => {
-      const fortmatic = new Fortmatic(
+      const instance = new Fortmatic(
         apiKey,
         networkId === 1 ? undefined : networkName(networkId)
       )
-      const provider = fortmatic.getProvider()
+      const provider = instance.getProvider()
 
       return {
         provider,
+        instance,
         interface: {
           name: "Fortmatic",
-          connect: fortmatic.user.login,
+          connect: instance.user.login,
           address: {
             get: () => Promise.resolve(provider.account)
           },
@@ -35,7 +36,7 @@ function fortmatic(options) {
           balance: {
             get: () =>
               provider.account &&
-              fortmatic.user.getBalances().then(res =>
+              instance.user.getBalances().then(res =>
                 res[0]
                   ? BigNumber(res[0].crypto_amount)
                       .times(BigNumber("1000000000000000000"))

src/modules/select/wallets/fortmatic.js

@@ -16,24 +16,25 @@ function portis(options) {
     name: "Portis",
     iconSrc: portisIcon,
     wallet: ({ BigNumber }) => {
-      const portis = new Portis(apiKey, networkName(networkId))
-      const { provider } = portis
+      const instance = new Portis(apiKey, networkName(networkId))
+      const { provider } = instance
 
       return {
         provider,
+        instance,
         interface: {
           name: "Portis",
           connect: provider.enable,
           address: {
             onChange: func => {
-              portis.onLogin(address => {
+              instance.onLogin(address => {
                 func(address)
                 provider.address = address
               })
             }
           },
           network: {
-            get: () => Promise.resolve(portis.config.network.chainId)
+            get: () => Promise.resolve(instance.config.network.chainId)
           },
           balance: {
             get: () =>

src/modules/select/wallets/portis.js

@@ -0,0 +1,75 @@
+import Squarelink from "squarelink"
+
+import { networkName, networkToId } from "../../../utilities"
+import sqlkIcon from "../wallet-icons/icon-squarelink.svg"
+
+function squarelink(options) {
+  if (!options || typeof options !== "object") {
+    throw new Error(
+      "An options object is required to initialize squarelink module"
+    )
+  }
+
+  const { apiKey, networkId } = options
+
+  if (!apiKey || typeof apiKey !== "string") {
+    throw new Error(
+      "A apiKey of type string is required to initialize squarelink module"
+    )
+  }
+
+  if (!networkId || typeof networkId !== "number") {
+    throw new Error(
+      "A network of type number is required to initialize squarelink module"
+    )
+  }
+
+  return {
+    name: "Squarelink",
+    iconSrc: sqlkIcon,
+    wallet: ({ BigNumber }) => {
+      const instance = new Squarelink(apiKey, networkName(networkId), {
+        useSync: true
+      })
+
+      const provider = instance.getProviderSync()
+
+      return {
+        provider,
+        instance,
+        interface: {
+          name: "Squarelink",
+          connect: provider.enable,
+          address: {
+            get: () => Promise.resolve(instance.accounts[0])
+          },
+          network: {
+            get: () => Promise.resolve(networkToId(instance.network))
+          },
+          balance: {
+            get: () =>
+              new Promise(resolve => {
+                if (!instance.accounts.length) {
+                  resolve(null)
+                  return
+                }
+
+                provider.sendAsync(
+                  {
+                    method: "eth_getBalance",
+                    params: [instance.accounts[0], "latest"],
+                    id: 1
+                  },
+                  (e, res) => {
+                    resolve(BigNumber(res.result).toString(10))
+                  }
+                )
+              })
+          }
+        }
+      }
+    }
+  }
+}
+
+export default squarelink

src/modules/select/wallets/squarelink.js

@@ -58,7 +58,11 @@
   }
 
   function handleWalletSelect(module) {
-    const { provider, interface: selectedWalletInterface } = module.wallet({
+    const {
+      provider,
+      interface: selectedWalletInterface,
+      instance
+    } = module.wallet({
       getProviderName,
       createLegacyProviderInterface,
       createModernProviderInterface,
@@ -89,6 +93,7 @@
 
     wallet.set({
       provider,
+      instance,
       name: module.name,
       connect: selectedWalletInterface.connect
     });

src/views/WalletSelect.svelte

@@ -17,6 +17,7 @@ interface selectDefaultsOptions {
   networkId: number
   fortmaticInit?: any
   portisInit?: any
+  squarelinkInit?: any
   walletConnectInit?: any
 }
 
@@ -28,6 +29,7 @@ interface select {
   coinbase: () => any
   trust: () => any
   portis: (options: { apiKey: string; network: string }) => any
+  squarleink: (options: { apiKey: string; network: string }) => any
   fortmatic: (options: { apiKey: string; network: string }) => any
 }