Merge branch 'main' of https://github.com/solana-labs/oyster into main

packages/bridge/src/components/EthereumConnect/index.tsx

@@ -0,0 +1,44 @@
+import React from 'react';
+import { Button } from 'antd';
+
+import { useCorrectNetwork } from '../../hooks/useCorrectNetwork';
+import metamaskIcon from '../../assets/metamask.svg';
+import { shortenAddress } from '@oyster/common';
+import { useEthereum } from '../../contexts';
+
+export const EthereumConnect = () => {
+  const { accounts, onConnectEthereum, connected } = useEthereum();
+  const { hasCorrespondingNetworks } = useCorrectNetwork();
+
+  return (
+    <div style={{ marginRight: 8 }}>
+      {connected ? (
+        hasCorrespondingNetworks ? (
+          <>
+            <img
+              alt={'metamask-icon'}
+              width={20}
+              height={20}
+              src={metamaskIcon}
+            />
+            {shortenAddress(accounts[0], 4)}
+          </>
+        ) : (
+          <Button danger type={'primary'}>
+            WRONG NETWORK
+          </Button>
+        )
+      ) : (
+        <Button onClick={() => onConnectEthereum && onConnectEthereum()}>
+          <img
+            alt={'metamask-icon'}
+            width={20}
+            height={20}
+            src={metamaskIcon}
+          />
+          Connect Metamask
+        </Button>
+      )}
+    </div>
+  );
+};

packages/bridge/src/components/Footer/index.tsx

@@ -11,15 +11,17 @@ export const Footer = () => {
       <SecurityAuditButton />
       <Button
         shape={'circle'}
+        target={'_blank'}
+        href={'https://github.com/solana-labs/oyster'}
         icon={<GithubOutlined />}
         style={{ marginRight: '20px' }}
-        onClick={() => window.open('https://github.com/solana-labs/oyster', '_blank')}
+      ></Button>
-      >
+      <Button
-      </Button>
+        shape={'circle'}
-      <Button shape={'circle'}
+        target={'_blank'}
-              icon={<TwitterOutlined />}
+        href={'https://twitter.com/solana'}
-              onClick={() => window.open('https://twitter.com/solana', '_blank')}>
+        icon={<TwitterOutlined />}
-      </Button>
+      ></Button>
     </div>
   );
 };

packages/bridge/src/components/Layout/index.tsx

@@ -6,20 +6,16 @@ import { Link, useLocation } from 'react-router-dom';
 import metamaskIcon from '../../assets/metamask.svg';
 
 import { LABELS } from '../../constants';
-import { contexts, AppBar, shortenAddress, useWallet } from '@oyster/common';
+import { AppBar } from '@oyster/common';
 import Wormhole from '../Wormhole';
-import { useEthereum } from '../../contexts';
-import { useCorrectNetwork } from '../../hooks/useCorrectNetwork';
 import { Footer as AppFooter } from './../Footer';
+import { EthereumConnect } from '../EthereumConnect';
 
 const { Header, Content, Footer } = Layout;
-const { useConnectionConfig } = contexts.Connection;
 
 export const AppLayout = React.memo((props: any) => {
   const location = useLocation();
   const [wormholeReady, setWormholeReady] = useState(false);
-  const { accounts, provider } = useEthereum();
-  const hasCorrespondingNetworks = useCorrectNetwork();
 
   const paths: { [key: string]: string } = {
     '/faucet': '7',
@@ -46,32 +42,7 @@ export const AppLayout = React.memo((props: any) => {
                     <h2>WORMHOLE</h2>
                   </Link>
                 </div>
-                <AppBar
+                <AppBar useWalletBadge={true} left={<EthereumConnect />} />
-                  useWalletBadge={true}
-                  left={
-                    <>
-                      {accounts[0] && (
-                        <div style={{ marginRight: 8 }}>
-                          {hasCorrespondingNetworks ? (
-                            <>
-                              <img
-                                alt={'metamask-icon'}
-                                width={20}
-                                height={20}
-                                src={metamaskIcon}
-                              />
-                              {shortenAddress(accounts[0], 4)}
-                            </>
-                          ) : (
-                            <Button danger type={'primary'}>
-                              WRONG NETWORK
-                            </Button>
-                          )}
-                        </div>
-                      )}
-                    </>
-                  }
-                />
               </Header>
             )}
             <Content style={{ padding: '0 50px', flexDirection: 'column' }}>

packages/bridge/src/components/SecurityAuditButton/index.tsx

@@ -5,8 +5,11 @@ import './index.less';
 
 export const SecurityAuditButton = () => {
   return (
-    <Button className={'audit-button'}
+    <Button
-            onClick={() => window.open('https://github.com/certusone/wormhole', '_blank')}>
+      className={'audit-button'}
+      target={'_blank'}
+      href={'https://github.com/certusone/wormhole'}
+    >
       Security Audit
     </Button>
   );

packages/bridge/src/components/Transfer/index.tsx

@@ -5,7 +5,12 @@ import { Input } from '../Input';
 
 import './style.less';
 import { ASSET_CHAIN, chainToName } from '../../utils/assets';
-import { fromSolana, ProgressUpdate, toSolana, TransferRequest } from '../../models/bridge';
+import {
+  fromSolana,
+  ProgressUpdate,
+  toSolana,
+  TransferRequest,
+} from '../../models/bridge';
 import { useEthereum } from '../../contexts';
 import { TokenDisplay } from '../TokenDisplay';
 import { WrappedAssetFactory } from '../../contracts/WrappedAssetFactory';
@@ -93,7 +98,7 @@ export const Transfer = () => {
       try {
         const bridgeAddress = programIds().wormhole.bridge;
 
-        if(request.from === ASSET_CHAIN.Solana) {
+        if (request.from === ASSET_CHAIN.Solana) {
 
           let signer = provider.getSigner();
           let e = WrappedAssetFactory.connect(asset, provider);
@@ -243,7 +248,7 @@ export const Transfer = () => {
               (async () => {
                 let steps: ProgressUpdate[] = [];
                 try {
-                  if(request.from === ASSET_CHAIN.Solana) {
+                  if (request.from === ASSET_CHAIN.Solana) {
                     debugger;
                     await fromSolana(
                       connection,

packages/bridge/src/components/Wormhole/WormholeCanvas.tsx

@@ -20,7 +20,7 @@ const WormholeCanvas = ({
     <Canvas onCreated={onCreated} style={{ opacity: 0.4 }}>
       <Camera />
       <React.Suspense fallback={null}>
-        <WormholeGeometry rotate={rotate}/>
+        <WormholeGeometry rotate={rotate} />
       </React.Suspense>
     </Canvas>
   );

packages/bridge/src/contexts/ethereum.tsx

@@ -13,7 +13,6 @@ import { useWallet as useEthereumWallet } from 'use-wallet';
 import WalletConnectProvider from '@walletconnect/web3-provider';
 // @ts-ignore
 import Fortmatic from 'fortmatic';
-import Torus from '@toruslabs/torus-embed';
 import { useConnectionConfig, useWallet, ENV } from '@oyster/common';
 import { TokenList, TokenInfo } from '@uniswap/token-lists';
 import { ethers } from 'ethers';
@@ -24,20 +23,27 @@ export interface EthereumContextState {
   tokens: TokenInfo[];
   tokenMap: Map<string, TokenInfo>;
   accounts: string[];
+  connected: boolean;
+  chainId: number;
+  onConnectEthereum?: () => void;
 }
 
 export const EthereumContext = createContext<EthereumContextState>({
   tokens: [],
   tokenMap: new Map<string, TokenInfo>(),
   accounts: [''],
+  chainId: 0,
+  connected: false,
 });
 
 export const EthereumProvider: FunctionComponent = ({ children }) => {
   const [accounts, setAccounts] = useState<string[]>(['']);
   const [provider, setProvider] = useState<ethers.providers.Web3Provider>();
-  const { env } = useConnectionConfig();
+  const [connected, setConnected] = useState<boolean>(false);
-  const { connected } = useWallet();
+  const [chainId, setChainId] = useState<number>(0);
-  const wallet = useEthereumWallet();
+  //const { env } = useConnectionConfig();
+  const { connected: walletConnected } = useWallet();
+  //const wallet = useEthereumWallet();
   const [tokens, setTokens] = useState<{
     map: Map<string, TokenInfo>;
     list: TokenInfo[];
@@ -94,26 +100,59 @@ export const EthereumProvider: FunctionComponent = ({ children }) => {
     })();
   }, [setTokens]);
 
+  const onConnectEthereum = () => {
+    // @ts-ignore
+    window.ethereum.request({ method: 'eth_requestAccounts' }).then(() => {
+      // @ts-ignore
+      const provider = new ethers.providers.Web3Provider(
+        (window as any).ethereum,
+      );
+      const signer = provider.getSigner();
+      signer.getAddress().then(account => {
+        setAccounts([account]);
+        setConnected(true);
+      });
+      provider.getNetwork().then(network => {
+        setChainId(network.chainId);
+      });
+      setProvider(provider);
+    });
+  };
+
   useEffect(() => {
     if (connected) {
       // @ts-ignore
-      window.ethereum.enable().then(() => {
+      window.ethereum.on('disconnect', error => {
-        // @ts-ignore
+        setConnected(false);
-        const provider = new ethers.providers.Web3Provider(
+      });
-          (window as any).ethereum,
+      // @ts-ignore
-        );
+      window.ethereum.on('accountsChanged', accounts => {
-        const signer = provider.getSigner();
+        if (!accounts || !accounts[0]) setConnected(false);
-        signer.getAddress().then(account => {
+      });
-          setAccounts([account]);
+      // @ts-ignore
-        });
+      window.ethereum.on('chainChanged', (chainId: string) => {
-        setProvider(provider);
+        setChainId(parseInt(chainId, 16));
       });
     }
   }, [connected]);
 
+  useEffect(() => {
+    if (walletConnected && !connected) {
+      onConnectEthereum();
+    }
+  }, [walletConnected]);
+
   return (
     <EthereumContext.Provider
-      value={{ tokens: tokens.list, tokenMap: tokens.map, accounts, provider }}
+      value={{
+        tokens: tokens.list,
+        tokenMap: tokens.map,
+        accounts,
+        provider,
+        connected,
+        chainId,
+        onConnectEthereum: () => onConnectEthereum(),
+      }}
     >
       {children}
     </EthereumContext.Provider>

packages/bridge/src/hooks/useCorrectNetwork.tsx

@@ -7,22 +7,21 @@ export const useCorrectNetwork = () => {
   const [hasCorrespondingNetworks, setHasCorrespondingNetworks] = useState(
     true,
   );
-  const { provider } = useEthereum();
+  const { connected, chainId } = useEthereum();
 
   useEffect(() => {
-    if (provider) {
+    if (connected) {
-      provider.getNetwork().then(network => {
+      if (chainId === 5) {
-        if (network.chainId === 5) {
+        setHasCorrespondingNetworks(env === 'testnet');
-          setHasCorrespondingNetworks(env === 'testnet');
+      } else if (chainId === 1) {
-        } else if (network.chainId === 1) {
+        setHasCorrespondingNetworks(env === 'mainnet-beta');
-          setHasCorrespondingNetworks(env === 'mainnet-beta');
+      } else {
-        } else {
+        setHasCorrespondingNetworks(false);
-          setHasCorrespondingNetworks(false);
+      }
-        }
+    } else {
-      });
+      setHasCorrespondingNetworks(true);
     }
-    setHasCorrespondingNetworks(true);
+  }, [connected, env, chainId]);
-  }, [provider, env]);
 
-  return hasCorrespondingNetworks;
+  return { hasCorrespondingNetworks };
 };