2233611204

Committed 27 Apr 2022 02:15PM UTC coverage: 35.33% (-0.08%) from 35.414%

Build Type

push

github

Committed by katspaugh

Commit Message

Revert "fix: decouple pairing provider (#3753)"

Run Details

1271 of 4537 branches covered (28.01%)

Branch coverage included in aggregate %.

6 of 31 new or added lines in 8 files covered. (19.35%)

27 existing lines in 3 files now uncovered.

3595 of 9236 relevant lines covered (38.92%)

35.41 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

9.52

/src/logic/wallets/walletConnect/utils.ts

import WalletConnectProvider from '@walletconnect/web3-provider'
import { IRPCMap, IWalletConnectProviderOptions } from '@walletconnect/types'
import { WalletInterface } from 'bnc-onboard/dist/src/interfaces'

import { getRpcServiceUrl } from 'src/config'
import { getChains } from 'src/config/cache/chains'
import { ChainId } from 'src/config/chain'
import { INFURA_TOKEN } from 'src/utils/constants'

type Options = Omit<IWalletConnectProviderOptions, 'bridge' | 'infuraId' | 'rpc' | 'chainId' | 'pollingInterval'>

export const getWalletConnectProvider = (chainId: ChainId, options: Options = {}): WalletConnectProvider => {
  const WC_BRIDGE = 'https://safe-walletconnect.gnosis.io/'
  // Prevent `eth_getBlockByNumber` polling every 4 seconds
  // https://github.com/WalletConnect/walletconnect-monorepo/issues/357#issuecomment-789663540
  const POLLING_INTERVAL = 60_000 * 60 // 1 hour
  const RPC_MAP: IRPCMap = getChains().reduce((map, { chainId, rpcUri }) => {
    return {
      ...map,
      [parseInt(chainId, 10)]: getRpcServiceUrl(rpcUri),
    }
  }, {})

  const provider = new WalletConnectProvider({
    bridge: WC_BRIDGE,
    pollingInterval: POLLING_INTERVAL,
    infuraId: INFURA_TOKEN,
    rpc: RPC_MAP,
    chainId: parseInt(chainId, 10),
    // Prevent `eth_getBlockByNumber` polling every 4 seconds
    ...options,
  })

  provider.autoRefreshOnNetworkChange = false

  return provider
}

export const getWCWalletInterface = (
  provider: WalletConnectProvider,
): Pick<WalletInterface, 'address' | 'network' | 'balance' | 'disconnect'> => {
  return {
    address: {
      onChange: (func) => {
        provider.send('eth_accounts').then((accounts: string[]) => accounts[0] && func(accounts[0]))
        provider.on('accountsChanged', (accounts: string[]) => func(accounts[0]))
      },
    },
    network: {
      onChange: (func) => {
        provider.send('eth_chainId').then(func)
        provider.on('chainChanged', func)
      },
    },
    // balance stateSynce prevents continuous `eth_getBalance` requests
    // (prevents us from accessing balance via Onboard, but via web3 works)
    balance: {},
    disconnect: () => {
      // Only disconnect if connected
      if (provider.wc.peerId) {
        provider.disconnect()
      }
    },
  }
}

1	import WalletConnectProvider from '@walletconnect/web3-provider'
2	import { IRPCMap, IWalletConnectProviderOptions } from '@walletconnect/types'
3	import { WalletInterface } from 'bnc-onboard/dist/src/interfaces'
4
5	import { getRpcServiceUrl } from 'src/config'
6	import { getChains } from 'src/config/cache/chains'
7	import { ChainId } from 'src/config/chain'
8	import { INFURA_TOKEN } from 'src/utils/constants'
9
10	type Options = Omit<IWalletConnectProviderOptions, 'bridge' \| 'infuraId' \| 'rpc' \| 'chainId' \| 'pollingInterval'>
11
12	export const getWalletConnectProvider = (chainId: ChainId, options: Options = {}): WalletConnectProvider => {	37!
NEW 13	const WC_BRIDGE = 'https://safe-walletconnect.gnosis.io/'	×
14	// Prevent `eth_getBlockByNumber` polling every 4 seconds
15	// https://github.com/WalletConnect/walletconnect-monorepo/issues/357#issuecomment-789663540
16	const POLLING_INTERVAL = 60_000 * 60 // 1 hour	×
17	const RPC_MAP: IRPCMap = getChains().reduce((map, { chainId, rpcUri }) => {	×
18	return {	×
19	...map,
20	[parseInt(chainId, 10)]: getRpcServiceUrl(rpcUri),
21	}
22	}, {})
23
24	const provider = new WalletConnectProvider({	×
25	bridge: WC_BRIDGE,
26	pollingInterval: POLLING_INTERVAL,
27	infuraId: INFURA_TOKEN,
28	rpc: RPC_MAP,
29	chainId: parseInt(chainId, 10),
30	// Prevent `eth_getBlockByNumber` polling every 4 seconds
31	...options,
32	})
33
34	provider.autoRefreshOnNetworkChange = false	×
35
36	return provider	×
37	}
38
39	export const getWCWalletInterface = (	37✔
40	provider: WalletConnectProvider,
41	): Pick<WalletInterface, 'address' \| 'network' \| 'balance' \| 'disconnect'> => {
42	return {	×
43	address: {
44	onChange: (func) => {
45	provider.send('eth_accounts').then((accounts: string[]) => accounts[0] && func(accounts[0]))	×
46	provider.on('accountsChanged', (accounts: string[]) => func(accounts[0]))	×
47	},
48	},
49	network: {
50	onChange: (func) => {
51	provider.send('eth_chainId').then(func)	×
52	provider.on('chainChanged', func)	×
53	},
54	},
55	// balance stateSynce prevents continuous `eth_getBalance` requests
56	// (prevents us from accessing balance via Onboard, but via web3 works)
57	balance: {},
58	disconnect: () => {
59	// Only disconnect if connected
60	if (provider.wc.peerId) {	×
61	provider.disconnect()	×
62	}
63	},
64	}
65	}

safe-global / safe-react / 2233611204

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous