22e3d3a · bridge · git.iko.soy

git.iko.soy/bridge

on master help sign in

Merge pull request #1075 from urbit/t/1073-metamask-no-connected-accounts

22e3d3atomholford4 years ago

src/lib/metamask.ts+21−4

compare with master

unifiedsplit

@@ -18,13 +18,30 @@ export const metamaskSignTransaction = async (txn: EIP1559Transaction) => {

18};

20const metamaskSendTransaction = async (txn: FakeSignableTx, web3: Web3) => {

21+ /**

22+ * Depending which version of Metamask is installed, there are different

23+ * approaches to get the `from` address.

24+ */

25+ let from = null;

26+ if (window.ethereum) {

27+ from = window.ethereum.selectedAddress;

28+ if (!from) {

29+ const accounts = await window.ethereum.request({ method: 'eth_requestAccounts' });

30+ from = accounts[0] ?? null;

31+ }

32+ } else if (window.web3) {

33+ from = window.web3?.eth?.defaultAccount ?? null;

34+ } else {

21− const accounts = await web3.eth.getAccounts();

35+ const accounts = await web3.eth.getAccounts();

22− if(accounts.length === 0) {

36+ from = accounts[0] ?? null;

37+ }

38+

39+ if (!from) {

23 throw new Error('No accounts connected');

40 throw new Error('No accounts connected');

24 }

41 }

25− const from = accounts[0];

42+

26 const { data, to, value, maxPriorityFeePerGas, maxFeePerGas } = txn.toJSON();

43 const { data, to, value, maxPriorityFeePerGas, maxFeePerGas } = txn.toJSON();

27− if (!(data && to && value && maxPriorityFeePerGas && maxFeePerGas && from)) { // TODO

44+ if (!(data && to && value && maxPriorityFeePerGas && maxFeePerGas && from)) {

28 throw new Error('Unable to send Metamask TX, something is missing');

45 throw new Error('Unable to send Metamask TX, something is missing');

29 }

46 }

src/react-app-env.d.ts+1

@@ -3,4 +3,5 @@ declare module 'folktale/maybe';

4interface Window {

5 ethereum: any;

6+ web3?: any;