e47013d · bridge · git.iko.soy

on master help sign in

metamask: resolve connected accounts

e47013dtomholford4 years ago

src/lib/metamask.ts+14−5

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

18};

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

21+ let from = null;

22+ if(window.ethereum) {

23+ from = window.ethereum.selectedAddress;

24+ if (!from) {

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

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

27+ }

28+ } else if (window.web3) {

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

30+ } else {

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

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

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

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

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

24 }

33 }

25− const from = accounts[0];

34+

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

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

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

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

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

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

29 }

38 }

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

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

4interface Window {

5 ethereum: any;

6+ web3?: any;