Feat/assert.sol

.env.local

@@ -1,14 +1,9 @@
 REACT_APP_DEFAULT_CHAINID=42161
 REACT_APP_VERSION=$npm_package_version
 
-REACT_APP_RPC_URL_1='https://eth-mainnet.g.alchemy.com/v2/ZXDCq5iy0KrKR0XjsqC6E4QG7Z_FuXDv'
-REACT_APP_RPC_URL_42161='https://arb-mainnet.g.alchemy.com/v2/vtMM4_eLnOvkjkdckprVw3cIa64EVkDZ'
-
-REACT_APP_DEFAULT_FORK_RPC_URL='https://rpc.tenderly.co/fork/6fd873f9-62cb-44b7-a7ab-e871f8f3b764'
+REACT_APP_DEFAULT_FORK_RPC_URL='https://rpc.tenderly.co/fork/90a229c1-7aef-4d13-a897-24e14b070508'
 REACT_APP_LOCALHOST_RPC_URL='http://127.0.0.1:8545'
 
-REACT_APP_RPC_URL_421611='https://arb-rinkeby.g.alchemy.com/v2/AY_Q_Uy-Kcfwmf5In5qwG636vaOIoA8L'
-
 TENDERLY_USER='Yield'
 TENDERLY_PROJECT='v2'
 TENDERLY_ACCESS_KEY='B4N3hpAhTmY09c3pyeC9zC8rMfto7ukj'
@@ -23,4 +18,4 @@ ALLOWED_SUPPORT_ADDRESSES='0x1Bd3Abb6ef058408734EA01cA81D325039cd7bcA, '
 
 KILLSWITCH_ACTIVE=false
 KILLSWITCH_CHAIN=1
-KILLSWITCH_TEXT='Due to an Euler Finance security incident, we are suspending UI interaction with the Yield Protocol until we have fully assessed the implications of the breach'
+KILLSWITCH_TEXT='Due to an incident, we are suspending UI interaction with the Yield Protocol until we have fully assessed the implications of the breach'

next.config.js

@@ -5,9 +5,6 @@ const nextConfig = {
   env: {
     REACT_APP_DEFAULT_CHAINID: process.env.REACT_APP_DEFAULT_CHAINID,
     REACT_APP_VERSION: process.env.REACT_APP_VERSION,
-    REACT_APP_INFURA_KEY_V1: process.env.REACT_APP_INFURA_KEY_V1,
-    REACT_APP_RPC_URL_1: process.env.TENDERLY_JSON_RPC_URL,
-    REACT_APP_RPC_URL_42161: process.env.REACT_APP_RPC_URL_42161,
 
     REACT_APP_DEFAULT_FORK_RPC_URL: process.env.REACT_APP_DEFAULT_FORK_RPC_URL,
     REACT_APP_LOCALHOST_RPC_URL: process.env.REACT_APP_LOCALHOST_RPC_URL,
@@ -22,6 +19,7 @@ const nextConfig = {
     TENDERLY_ACCESS_KEY: process.env.TENDERLY_ACCESS_KEY,
 
     ALLOWED_SUPPORT_ADDRESSES: process.env.ALLOWED_SUPPORT_ADDRESSES,
+
     KILLSWITCH_ACTIVE: process.env.KILLSWITCH_ACTIVE,
     KILLSWITCH_TEXT: process.env.KILLSWITCH_TEXT,
     KILLSWITCH_CHAIN: process.env.KILLSWITCH_CHAIN,

src/components/selectors/AssetSelector.tsx

@@ -43,6 +43,7 @@ function AssetSelector({ selectCollateral, isModal }: IAssetSelectorProps) {
   const [options, setOptions] = useState<IAsset[]>([]);
   const [modalOpen, toggleModal] = useState<boolean>(false);
   const { logAnalyticsEvent } = useAnalytics();
+
   const { validIlks, validIlksLoading } = useAssetPair(undefined, undefined, selectedSeries?.id);
 
   const optionText = (asset: IAsset | undefined) =>
@@ -79,7 +80,7 @@ function AssetSelector({ selectCollateral, isModal }: IAssetSelectorProps) {
 
   /* update options on any changes */
   useEffect(() => {
-    const opts = (selectCollateral ? validIlks! : Array.from(assetMap.values()))
+    const opts = (selectCollateral && validIlks ? validIlks : Array.from(assetMap.values())) // if !validIlks, then we just return all assets ( for forked env )
       .filter((a) => a.showToken)
       .filter((a) => (showWrappedTokens ? true : !a.isWrappedToken)); // filter based on whether wrapped tokens are shown or not
 

src/config/assets.ts

@@ -12,7 +12,6 @@ export interface AssetStaticInfo {
   digitFormat: number; // this is the 'reasonable' number of digits to show. accuracy equivalent to +- 1 us cent.
 
   tokenRoles: TokenRole[];
-
   // optionals
   // isYieldBase?: boolean;
 

src/config/contracts.ts

@@ -8,6 +8,7 @@ export enum ContractNames {
   WRAP_ETHER_MODULE = 'WrapEtherModule',
   CONVEX_LADLE_MODULE = 'ConvexLadleModule',
   TRANSFER_1155_MODULE = 'Transfer1155Module',
+  ASSERT = 'Assert',
 }
 
 export type ContractMap = Map<ContractNames, Contract>;
@@ -28,6 +29,7 @@ const contractAddresses: ContractAddresses = {
         [ContractNames.TRANSFER_1155_MODULE, '0x97f1d43A217aDD678bB6Dcd3C5D51F40b6729d06'],
         [ContractNames.WRAP_ETHER_MODULE, '0x22768FCaFe7BB9F03e31cb49823d1Ece30C0b8eA'],
         [ContractNames.CONVEX_LADLE_MODULE, '0x9Bf195997581C99cef8be95a3a816Ca19Cf1A3e6'],
+        [ContractNames.ASSERT, '0x40f0b18c7a41c04f848c033ed7f9178d9c5a80d8'],
       ]),
     ],
     [
@@ -38,6 +40,7 @@ const contractAddresses: ContractAddresses = {
         [ContractNames.WITCH, '0x08173D0885B00BDD640aaE57D05AbB74cd00d669'],
         [ContractNames.WITCHV2, '0x07c2c74811cb14a5003c3ccff7ec436d504fffb6'],
         [ContractNames.WRAP_ETHER_MODULE, '0x4cd01ed221d6d198e2656c16c32803bf78134568'],
+        [ContractNames.ASSERT, '0x40f0b18c7a41c04f848c033ed7f9178d9c5a80d8'],
       ]),
     ],
   ]),

src/contexts/SettingsContext.tsx

@@ -1,6 +1,7 @@
 import { createContext, Dispatch, ReactNode, useEffect, useReducer } from 'react';
 import { USDC } from '../config/assets';
 import { ApprovalType } from '../types';
+import { BLANK_ADDRESS } from '../utils/constants';
 import { ISettingsContextActions, ISettingsContextState, Settings, SettingsContextAction } from './types/settings';
 
 const initState: ISettingsContextState = {
@@ -39,6 +40,7 @@ const initState: ISettingsContextState = {
   /* Development settings */
 
   /* Always force transctions to the chain -> even if they will likely fail */
+
   forceTransactions: false,
 
   /* Show diagnostic messages in the console */