Merge branch 'develop' into feature/move-ws-init

Author: dmarzzz

rollup.config.js

@@ -68,6 +68,7 @@ export default {
     'trezor-connect',
     'ethereumjs-tx',
     'ethereumjs-util',
+    'eth-lattice-keyring',
     'hdkey',
     '@ledgerhq/hw-transport-u2f',
     '@ledgerhq/hw-app-eth',

src/modules/select/index.ts

@@ -17,7 +17,8 @@ const mobileDefaultWalletNames = [
   'hyperpay',
   'tokenpocket',
   'dcent',
-  'atoken'
+  'atoken',
+  'liquality'
 ]
 
 function select(
@@ -122,6 +123,8 @@ function getModule(
       return import('./wallets/dcent')
     case 'atoken':
       return import('./wallets/atoken')
+    case 'liquality':
+      return import('./wallets/liquality')
     default:
       throw new Error(`${name} is not a valid walletName.`)
   }

src/modules/select/wallet-icons/icon-liquality.png

@@ -0,0 +1,39 @@
+import { extensionInstallMessage } from '../content'
+import { WalletModule, Helpers, CommonWalletOptions } from '../../../interfaces'
+
+import liqualityIcon from '../wallet-icons/icon-liquality.png'
+import liqualityIcon2x from '../wallet-icons/icon-liquality@2x.png'
+
+function liquality(options: CommonWalletOptions): WalletModule {
+    const { preferred, label, iconSrc, svg } = options
+
+    return {
+        name: label || 'Liquality',
+        iconSrc: iconSrc || liqualityIcon,
+        iconSrcSet: iconSrc || liqualityIcon2x,
+        svg,
+        wallet: async (helpers: Helpers) => {
+            const { getProviderName, createModernProviderInterface } = helpers
+
+            const provider =
+                (window as any).ethereum ||
+                ((window as any).web3 && (window as any).web3.currentProvider)
+
+            return {
+                provider,
+                interface:
+                    (getProviderName(provider) === 'Liquality' &&
+                        createModernProviderInterface(provider)) ||
+                    null
+            }
+        },
+        type: 'injected',
+        link: 'https://liquality.io',
+        installMessage: extensionInstallMessage,
+        desktop: true,
+        mobile: false,
+        preferred
+    }
+}
+
+export default liquality

src/modules/select/wallet-icons/icon-liquality@2x.png

@@ -1,4 +1,4 @@
-import { getBlocknative } from './services'
+import { getBlocknative, initializeBlocknative } from './services'
 import { writable, derived, get } from 'svelte/store'
 import { wait, makeCancelable, createInterval } from './utilities'
 import { validateWalletInterface, validateType } from './validation'
@@ -309,6 +309,14 @@ function createBalanceStore(initialState: string | null): BalanceStore {
             currentBalance: get(balance)
           })
 
+          if (!getBlocknative()) {
+            initializeBlocknative(
+              get(app).dappId,
+              get(app).networkId,
+              get(app).apiUrl
+            )
+          }
+
           if (emitterAddress !== $address) {
             const blocknative = getBlocknative()
 

src/modules/select/wallets/liquality.ts

@@ -262,6 +262,10 @@ export function getProviderName(provider: any): string | undefined {
     return 'AToken'
   }
 
+  if (provider.isLiquality) {
+    return 'Liquality'
+  }
+
   if (provider.host && provider.host.indexOf('localhost') !== -1) {
     return 'localhost'
   }