Add new token

Author: Itzik Grossman

.prettierrc.json

@@ -1,5 +1,5 @@
 {
-  "printWidth": 80,
+  "printWidth": 120,
   "singleQuote": true,
   "trailingComma": "all"
 }

src/blockchain-bridge/scrt/CustomTokens.ts

@@ -0,0 +1,31 @@
+import { TokenDisplay } from '../../pages/Swap';
+
+const LOCAL_STORAGE_KEY = 'SwapLocalStorageTokens';
+
+const setLocalStorage = item => localStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(item));
+const getLocalStorage = () => JSON.parse(localStorage.getItem(LOCAL_STORAGE_KEY));
+
+class LocalStorageTokens {
+  static store(token: TokenDisplay) {
+    let tokens: Record<string, TokenDisplay> | null = getLocalStorage();
+
+    // todo: handle overwriting tokens with the same symbol
+    if (!tokens) {
+      tokens = {};
+    }
+    tokens[token.symbol] = token;
+
+    setLocalStorage(tokens);
+    window.dispatchEvent(new Event('storage'));
+  }
+
+  static get(): Record<string, TokenDisplay> | null {
+    try {
+      return getLocalStorage();
+    } catch {
+      return null;
+    }
+  }
+}
+
+export default LocalStorageTokens;

src/blockchain-bridge/scrt/snip20.ts

@@ -1,14 +1,45 @@
 import { ExecuteResult, SigningCosmWasmClient } from 'secretjs';
 import { divDecimals, unlockToken } from '../../utils';
 
-export const Snip20SwapHash = (params: { tx_id: string, address: string }): string => {
+export const Snip20SwapHash = (params: { tx_id: string; address: string }): string => {
   return `${params.tx_id}|${params.address}`;
+};
+
+export interface Snip20TokenInfo {
+  name: string;
+  symbol: string;
+  decimals: number;
+  total_supply?: string;
 }
 
+export const GetSnip20Params = async (params: {
+  secretjs: SigningCosmWasmClient;
+  address: string;
+}): Promise<Snip20TokenInfo> => {
+  const { secretjs, address } = params;
+
+  try {
+    const paramsResponse = await secretjs.queryContractSmart(address, { token_info: {} });
 
-export const Snip20GetBalance = async (params: { secretjs: SigningCosmWasmClient, token: string, address: string, key: string, decimals: number }) => {
+    return {
+      name: paramsResponse.token_info.name,
+      symbol: paramsResponse.token_info.symbol,
+      decimals: paramsResponse.token_info.decimals,
+      total_supply: paramsResponse.token_info?.total_supply,
+    };
+  } catch (e) {
+    throw Error('Failed to get info');
+  }
+};
 
-  const {secretjs, address, token, key, decimals } = params;
+export const Snip20GetBalance = async (params: {
+  secretjs: SigningCosmWasmClient;
+  token: string;
+  address: string;
+  key: string;
+  decimals: number;
+}) => {
+  const { secretjs, address, token, key, decimals } = params;
 
   let balanceResponse;
   try {
@@ -19,7 +50,7 @@ export const Snip20GetBalance = async (params: { secretjs: SigningCosmWasmClient
       },
     });
   } catch (e) {
-    console.log(e)
+    console.log(e);
     return unlockToken;
   }
 
@@ -30,42 +61,47 @@ export const Snip20GetBalance = async (params: { secretjs: SigningCosmWasmClient
   if (Number(balanceResponse.balance.amount) === 0) {
     return '0';
   }
-  return divDecimals(
-    balanceResponse.balance.amount,
-    decimals,
-  );
-}
+  return divDecimals(balanceResponse.balance.amount, decimals);
+};
 
-export const Snip20SendToBridge = async (params: { secretjs: SigningCosmWasmClient, address: string, amount: string, msg: string, recipient?: string }): Promise<string> => {
-  const tx = await Snip20Send({recipient: params.recipient || process.env.SCRT_SWAP_CONTRACT, ...params});
+export const Snip20SendToBridge = async (params: {
+  secretjs: SigningCosmWasmClient;
+  address: string;
+  amount: string;
+  msg: string;
+  recipient?: string;
+}): Promise<string> => {
+  const tx = await Snip20Send({
+    recipient: params.recipient || process.env.SCRT_SWAP_CONTRACT,
+    ...params,
+  });
 
-  const txIdKvp = tx.logs[0].events[1].attributes.find(
-    kv => kv.key === 'tx_id',
-  );
+  const txIdKvp = tx.logs[0].events[1].attributes.find(kv => kv.key === 'tx_id');
 
   let tx_id: string;
   if (txIdKvp && txIdKvp.value) {
     tx_id = txIdKvp.value;
   } else {
-    throw new Error("Failed to get tx_id")
+    throw new Error('Failed to get tx_id');
   }
 
-  return tx_id
-}
-
-export const Snip20Send = async (params: { secretjs: SigningCosmWasmClient, address: string, amount: string, msg: string, recipient: string }): Promise<ExecuteResult> => {
+  return tx_id;
+};
 
-  const {secretjs, address, amount, msg, recipient } = params;
+export const Snip20Send = async (params: {
+  secretjs: SigningCosmWasmClient;
+  address: string;
+  amount: string;
+  msg: string;
+  recipient: string;
+}): Promise<ExecuteResult> => {
+  const { secretjs, address, amount, msg, recipient } = params;
 
-  return await secretjs.execute(
-    address,
-    {
-      send: {
-        amount,
-        recipient,
-        msg,
-      },
+  return await secretjs.execute(address, {
+    send: {
+      amount,
+      recipient,
+      msg,
     },
-  );
-
-}
+  });
+};

src/blockchain-bridge/scrt/utils.ts

@@ -1,14 +1,17 @@
 import { decode } from 'bech32';
 
-const HRP = "secret";
+const HRP = 'secret';
 
-export const getScrtAddress = address => {
+export const getScrtAddress = (address: string): string => {
   try {
     const decoded = decode(address, 46);
     return decoded.prefix === HRP ? address : '';
   } catch {
     return '';
   }
-}
+};
 
+export const validateBech32Address = (address: string): boolean => {
+  return getScrtAddress(address) !== '';
+};
 // getAddress(address).bech32;

src/components/Earn/SoftTitleValue/index.tsx

@@ -2,7 +2,10 @@ import React from 'react';
 import * as styles from './styles.styl';
 import cn from 'classnames';
 
-const SoftTitleValue = props => {
+const SoftTitleValue = (props: {
+  title: string | JSX.Element;
+  subTitle?: string | JSX.Element;
+}) => {
   if (props.subTitle) {
     return (
       <div>