Upgrading (#97)

.env → .env.example

@@ -1,2 +1,4 @@
 REACT_APP_USDT_REFERRAL_FEES_ADDRESS=''
 REACT_APP_USDC_REFERRAL_FEES_ADDRESS=''
+REACT_APP_ALLOW_REF_LINK=true
+REACT_APP_EXCLUDE_MARKETS=[]

.gitignore

@@ -23,3 +23,5 @@ yarn-debug.log*
 yarn-error.log*
 
 .idea
+
+.env

package.json

@@ -10,8 +10,10 @@
     "@project-serum/associated-token": "0.1.0",
     "@project-serum/awesome-serum": "1.0.1",
     "@project-serum/pool": "0.2.2",
-    "@project-serum/serum": "^0.13.25",
-    "@project-serum/sol-wallet-adapter": "^0.1.1",
+    "@project-serum/serum": "^0.13.41",
+    "@project-serum/sol-wallet-adapter": "^0.2.0",
+    "@solana/spl-name-service": "^0.1.2",
+    "@solana/spl-token": "^0.1.6",
     "@solana/web3.js": "0.86.1",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
@@ -26,7 +28,9 @@
     "bn.js": "^5.1.3",
     "craco-less": "^1.17.0",
     "immutable-tuple": "^0.4.10",
+    "nanoid": "^3.1.22",
     "qrcode.react": "^1.0.0",
+    "query-string": "^7.0.1",
     "react": "^16.13.1",
     "react-app-polyfill": "^1.0.5",
     "react-copy-to-clipboard": "^5.0.2",

src/App.tsx

@@ -7,20 +7,23 @@ import { Spin } from 'antd';
 import ErrorBoundary from './components/ErrorBoundary';
 import { Routes } from './routes';
 import { PreferencesProvider } from './utils/preferences';
+import { ReferrerProvider } from './utils/referrer';
 
 export default function App() {
   return (
     <Suspense fallback={() => <Spin size="large" />}>
       <GlobalStyle />
       <ErrorBoundary>
         <ConnectionProvider>
-          <WalletProvider>
-            <PreferencesProvider>
-              <Suspense fallback={() => <Spin size="large" />}>
-                <Routes />
-              </Suspense>
-            </PreferencesProvider>
-          </WalletProvider>
+          <ReferrerProvider>
+            <WalletProvider>
+              <PreferencesProvider>
+                <Suspense fallback={() => <Spin size="large" />}>
+                  <Routes />
+                </Suspense>
+              </PreferencesProvider>
+            </WalletProvider>
+          </ReferrerProvider>
         </ConnectionProvider>
       </ErrorBoundary>
     </Suspense>

src/components/AppSearch.tsx

@@ -10,7 +10,7 @@ const appsAndTokens = apps.concat(
   TOKEN_MINTS.map((mint) => {
     return {
       name: `${mint.name} SPL`,
-      url: `https://explorer.solana.com/address/${mint.address.toBase58()}`,
+      url: `https://solscan.io/address/${mint.address.toBase58()}`,
       description: `${mint.name} SPL token`,
       icon: '',
       tags: [

src/components/BasicLayout.js

@@ -1,10 +1,25 @@
 import { Layout } from 'antd';
-import React from 'react';
+import React, { useEffect } from 'react';
 import TopBar from './TopBar';
 import { CustomFooter as Footer } from './Footer';
+import { useReferrer } from '../utils/referrer';
+import queryString from 'query-string';
+import { useLocation } from 'react-router-dom';
+import { notify } from '../utils/notifications';
 const { Header, Content } = Layout;
 
 export default function BasicLayout({ children }) {
+  const { refCode, setRefCode, allowRefLink } = useReferrer();
+  const { search } = useLocation();
+  const parsed = queryString.parse(search);
+
+  useEffect(() => {
+    if (!!parsed.refCode && parsed.refCode !== refCode && allowRefLink) {
+      notify({ message: `New referrer ${parsed.refCode} added` });
+      setRefCode(parsed.refCode);
+    }
+  }, [parsed, refCode, setRefCode, allowRefLink]);
+
   return (
     <React.Fragment>
       <Layout

src/components/DeprecatedMarketsInstructions.js

@@ -30,12 +30,12 @@ export default function DeprecatedMarketsInstructions({ switchToLiveMarkets }) {
   return (
     <FloatingElement>
       <Title level={4} style={{ color: 'rgba(255, 255, 255, 1)' }}>
-        Migrate to Serum DEX V3 markets
+        Migrate new markets
       </Title>
       <Typography>
-        Markets on older versions of the DEX are now deprecated. To migrate over
-        to the new markets, please cancel your orders and settle your funds on
-        old markets.
+        Markets on older versions of the DEX or using Wrapped USDT are now deprecated. To migrate over
+        to the new markets, please cancel your orders and settle your funds on old markets. To convert
+        from Wrapped USDT to Native USDT use sollet.io.
       </Typography>
       <div style={{ marginTop: 20, display: 'flex', justifyContent: 'center' }}>
         <Button onClick={() => refresh(true)}>

src/components/Footer.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { Layout, Row, Col, Grid } from 'antd';
 import Link from './Link';
 import { helpUrls } from './HelpUrls';
+import { useReferrer } from '../utils/referrer';
 const { Footer } = Layout;
 const { useBreakpoint } = Grid;
 
@@ -19,15 +20,18 @@ const footerElements = [
 
 export const CustomFooter = () => {
   const smallScreen = !useBreakpoint().lg;
-
+  const { refCode, allowRefLink } = useReferrer();
   return (
     <Footer
       style={{
-        height: '45px',
+        height: '55px',
         paddingBottom: 10,
         paddingTop: 10,
       }}
     >
+      {refCode && allowRefLink && (
+        <Row justify="center">Your referrer is {refCode}</Row>
+      )}
       <Row align="middle" gutter={[16, 4]}>
         {!smallScreen && (
           <>

src/components/LinkAddress.tsx

@@ -17,7 +17,7 @@ export default function LinkAddress({
       <Button
         type="link"
         icon={<LinkOutlined />}
-        href={'https://explorer.solana.com/address/' + address}
+        href={'https://solscan.io/address/' + address}
         target="_blank"
         rel="noopener noreferrer"
         style={{ cursor: 'pointer' }}

src/components/StandaloneBalancesDisplay.tsx

@@ -20,6 +20,10 @@ import { Balances } from '../utils/types';
 import StandaloneTokenAccountsSelect from './StandaloneTokenAccountSelect';
 import LinkAddress from './LinkAddress';
 import { InfoCircleOutlined } from '@ant-design/icons';
+import { useInterval } from '../utils/useInterval';
+import { useLocalStorageState } from '../utils/utils';
+import { AUTO_SETTLE_DISABLED_OVERRIDE } from '../utils/preferences';
+import { useReferrer } from '../utils/referrer';
 
 const RowBox = styled(Row)`
   padding-bottom: 20px;
@@ -50,7 +54,9 @@ export default function StandaloneBalancesDisplay() {
     balances && balances.find((b) => b.coin === baseCurrency);
   const quoteCurrencyBalances =
     balances && balances.find((b) => b.coin === quoteCurrency);
-
+  const [autoSettleEnabled] = useLocalStorageState('autoSettleEnabled', true);
+  const [lastSettledAt, setLastSettledAt] = useState<number>(0);
+  const { usdcRef, usdtRef } = useReferrer();
   async function onSettleFunds() {
     if (!wallet) {
       notify({
@@ -102,6 +108,8 @@ export default function StandaloneBalancesDisplay() {
         wallet,
         baseCurrencyAccount,
         quoteCurrencyAccount,
+        usdcRef,
+        usdtRef,
       });
     } catch (e) {
       notify({
@@ -112,6 +120,50 @@ export default function StandaloneBalancesDisplay() {
     }
   }
 
+  useInterval(() => {
+    const autoSettle = async () => {
+      if (
+        AUTO_SETTLE_DISABLED_OVERRIDE ||
+        !wallet ||
+        !market ||
+        !openOrdersAccount ||
+        !baseCurrencyAccount ||
+        !quoteCurrencyAccount ||
+        !autoSettleEnabled
+      ) {
+        return;
+      }
+      if (
+        !baseCurrencyBalances?.unsettled &&
+        !quoteCurrencyBalances?.unsettled
+      ) {
+        return;
+      }
+      if (Date.now() - lastSettledAt < 15000) {
+        return;
+      }
+      try {
+        console.log('Settling funds...');
+        setLastSettledAt(Date.now());
+        await settleFunds({
+          market,
+          openOrders: openOrdersAccount,
+          connection,
+          wallet,
+          baseCurrencyAccount,
+          quoteCurrencyAccount,
+          usdcRef,
+          usdtRef,
+        });
+      } catch (e) {
+        console.log('Error auto settling funds: ' + e.message);
+        return;
+      }
+      console.log('Finished settling funds.');
+    };
+    connected && wallet?.autoApprove && autoSettleEnabled && autoSettle();
+  }, 1000);
+
   const formattedBalances: [
     string | undefined,
     Balances | undefined,

src/components/TopBar.tsx

@@ -45,7 +45,7 @@ const EXTERNAL_LINKS = {
   '/wallet-support': 'https://serum-academy.com/en/wallet-support',
   '/dex-list': 'https://serum-academy.com/en/dex-list/',
   '/developer-resources': 'https://serum-academy.com/en/developer-resources/',
-  '/explorer': 'https://explorer.solana.com',
+  '/explorer': 'https://solscan.io',
   '/srm-faq': 'https://projectserum.com/srm-faq',
   '/swap': 'https://swap.projectserum.com',
 };

src/components/TradeForm.tsx

@@ -1,29 +1,25 @@
-import { Button, Input, Radio, Switch, Slider } from 'antd';
-import React, { useState, useEffect } from 'react';
+import {Button, Input, Radio, Slider, Switch} from 'antd';
+import React, {useEffect, useState} from 'react';
 import styled from 'styled-components';
 import {
-  useSelectedBaseCurrencyBalances,
-  useSelectedQuoteCurrencyBalances,
+  useFeeDiscountKeys,
+  useLocallyStoredFeeDiscountKey,
   useMarket,
   useMarkPrice,
-  useSelectedOpenOrdersAccount,
   useSelectedBaseCurrencyAccount,
+  useSelectedBaseCurrencyBalances,
+  useSelectedOpenOrdersAccount,
   useSelectedQuoteCurrencyAccount,
-  useFeeDiscountKeys,
-  useLocallyStoredFeeDiscountKey,
+  useSelectedQuoteCurrencyBalances,
 } from '../utils/markets';
-import { useWallet } from '../utils/wallet';
-import { notify } from '../utils/notifications';
-import {
-  getDecimalCount,
-  roundToDecimal,
-  floorToDecimal,
-} from '../utils/utils';
-import { useSendConnection } from '../utils/connection';
+import {useWallet} from '../utils/wallet';
+import {notify} from '../utils/notifications';
+import {floorToDecimal, getDecimalCount, roundToDecimal,} from '../utils/utils';
+import {useSendConnection} from '../utils/connection';
 import FloatingElement from './layout/FloatingElement';
-import { getUnixTs, placeOrder } from '../utils/send';
-import { SwitchChangeEventHandler } from 'antd/es/switch';
-import { refreshCache } from '../utils/fetch-loop';
+import {getUnixTs, placeOrder} from '../utils/send';
+import {SwitchChangeEventHandler} from 'antd/es/switch';
+import {refreshCache} from '../utils/fetch-loop';
 import tuple from 'immutable-tuple';
 
 const SellButton = styled(Button)`

src/components/UserInfoTable/BalancesTable.jsx

@@ -9,6 +9,7 @@ import { useSendConnection } from '../../utils/connection';
 import { useWallet } from '../../utils/wallet';
 import { settleFunds } from '../../utils/send';
 import { notify } from '../../utils/notifications';
+import { useReferrer } from '../../utils/referrer';
 
 export default function BalancesTable({
   balances,
@@ -19,6 +20,7 @@ export default function BalancesTable({
   const [accounts] = useTokenAccounts();
   const connection = useSendConnection();
   const { wallet } = useWallet();
+  const { usdcRef, usdtRef } = useReferrer();
 
   async function onSettleFunds(market, openOrders) {
     try {
@@ -35,6 +37,8 @@ export default function BalancesTable({
           accounts,
           market?.quoteMintAddress,
         ),
+        usdcRef,
+        usdtRef,
       });
     } catch (e) {
       notify({

src/components/UserInfoTable/WalletBalancesTable.tsx

@@ -86,7 +86,7 @@ export default function WalletBalancesTable({
       render: (walletBalance) => (
         <Row align="middle">
           <a
-            href={`https://explorer.solana.com/address/${walletBalance.mint}`}
+            href={`https://solscan.io/address/${walletBalance.mint}`}
             target={'_blank'}
             rel="noopener noreferrer"
           >

src/pages/TradePage.tsx

@@ -24,6 +24,7 @@ import {
 import CustomMarketDialog from '../components/CustomMarketDialog';
 import { notify } from '../utils/notifications';
 import { useHistory, useParams } from 'react-router-dom';
+import { nanoid } from 'nanoid';
 
 const { Option, OptGroup } = Select;
 
@@ -250,7 +251,7 @@ function MarketSelector({
           {customMarkets.map(({ address, name }, i) => (
             <Option
               value={address}
-              key={address}
+              key={nanoid()}
               name={name}
               style={{
                 padding: '10px',
@@ -296,7 +297,7 @@ function MarketSelector({
           .map(({ address, name, deprecated }, i) => (
             <Option
               value={address.toBase58()}
-              key={address}
+              key={nanoid()}
               name={name}
               style={{
                 padding: '10px',

src/pages/pools/PoolPage/PoolBalancesPanel.tsx

@@ -112,7 +112,7 @@ function BalanceItem({ mint, publicKey, isPoolToken }: BalanceItemProps) {
       <Button
         type="link"
         icon={<LinkOutlined />}
-        href={'https://explorer.solana.com/address/' + publicKey.toBase58()}
+        href={'https://solscan.io/address/' + publicKey.toBase58()}
         target="_blank"
         rel="noopener noreferrer"
       />

src/utils/fetch-loop.tsx

@@ -261,3 +261,9 @@ export function setCache(
     loop.notifyListeners();
   }
 }
+
+export function getCache(
+  cacheKey: any
+) {
+  return globalCache.get(cacheKey);
+}