Remove code related to the gas based staking pools

apps/staking/__tests__/components/pools/PoolCommission.test.tsx

@@ -10,11 +10,11 @@
 // PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 import { render, screen } from '@testing-library/react';
+import { FaNetworkWired } from 'react-icons/fa';
 import PoolCommission from '../../../src/components/pools/PoolCommission';
-import { withChakraTheme } from '../../test-utilities';
 import { StakingPool } from '../../../src/graphql/models';
 import stakingPoolsData from '../../../src/stories/stake/tables/stakingPoolsData';
-import { FaNetworkWired } from 'react-icons/fa';
+import { withChakraTheme } from '../../test-utilities';
 
 const [pool] = stakingPoolsData as unknown as StakingPool[];
 
@@ -43,9 +43,7 @@ describe('PoolCommission component', () => {
             pool.commissionPercentage !== null
                 ? numberFormat.format(pool.commissionPercentage)
                 : '-';
-        const commissionLabel = pool.fee.commission
-            ? `${(pool.fee.commission / 100).toFixed(2)} %`
-            : `${pool.fee.gas} Gas`;
+        const commissionLabel = `${(pool.fee.commission / 100).toFixed(2)} %`;
 
         const valueLabel = `${accruedCommissionLabel} (${commissionLabel})`;
 

apps/staking/__tests__/components/stake/PoolSetting.test.tsx

@@ -23,6 +23,7 @@ import { BigNumber } from 'ethers';
 import { PoolSetting } from '../../../src/components/stake/PoolSetting';
 import useStakingPoolQuery from '../../../src/graphql/hooks/useStakingPool';
 import useTotalPoolBalance from '../../../src/graphql/hooks/useTotalPoolBalance';
+import { StakingPool } from '../../../src/graphql/models';
 import { useStakingPool } from '../../../src/services/pool';
 import { useStakingPoolFactory } from '../../../src/services/poolFactory';
 import { withChakraTheme } from '../../test-utilities';

apps/staking/__tests__/services/pool.test.ts

@@ -9,28 +9,25 @@
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 // PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
-import { renderHook, waitFor } from '@testing-library/react';
 import {
-    useFlatRateCommission,
-    useGasTaxCommission,
-    useStakingPool,
-    useStakingPoolCommission,
-} from '../../src/services/pool';
+    Fee,
+    FlatRateCommission,
+    StakingPoolImpl,
+} from '@cartesi/staking-pool';
+import { renderHook, waitFor } from '@testing-library/react';
+import { BigNumber, FixedNumber } from 'ethers';
+import { act } from 'react-dom/test-utils';
 import {
     useFeeContract,
     useFlatRateCommissionContract,
-    useGasTaxCommissionContract,
     useStakingPoolContract,
 } from '../../src/services/contracts';
-import { useTransaction, Transaction } from '../../src/services/transaction';
 import {
-    Fee,
-    FlatRateCommission,
-    GasTaxCommission,
-    StakingPoolImpl,
-} from '@cartesi/staking-pool';
-import { act } from 'react-dom/test-utils';
-import { BigNumber, FixedNumber } from 'ethers';
+    useFlatRateCommission,
+    useStakingPool,
+    useStakingPoolCommission,
+} from '../../src/services/pool';
+import { Transaction, useTransaction } from '../../src/services/transaction';
 
 jest.mock('@explorer/wallet/src/useWallet');
 
@@ -43,7 +40,6 @@ jest.mock('../../src/services/eth', () => ({
 }));
 
 jest.mock('../../src/services/contracts', () => ({
-    useGasTaxCommissionContract: jest.fn(),
     useFlatRateCommissionContract: jest.fn(),
     useFeeContract: jest.fn(),
     useStakingPoolContract: jest.fn(),
@@ -55,10 +51,6 @@ const mockedUseTransaction = useTransaction as jest.MockedFunction<
     typeof useTransaction
 >;
 
-const mockedUseGasTaxCommissionContract =
-    useGasTaxCommissionContract as jest.MockedFunction<
-        typeof useGasTaxCommissionContract
-    >;
 const mockedUseFlatRateCommissionContract =
     useFlatRateCommissionContract as jest.MockedFunction<
         typeof useFlatRateCommissionContract
@@ -72,14 +64,6 @@ const mockUseFeeContract = useFeeContract as jest.MockedFunction<
     typeof useFeeContract
 >;
 
-const gasTaxCommissionContract = {
-    setGas: jest.fn(),
-    gas: () => Promise.resolve(),
-    feeRaiseTimeout: () => Promise.resolve(),
-    maxRaise: () => Promise.resolve(),
-    timeoutTimestamp: () => Promise.resolve(BigNumber.from('10000')),
-};
-
 const flatRateCommissionContract = {
     setRate: jest.fn(),
     rate: () => Promise.resolve(),
@@ -117,59 +101,6 @@ const stakingPoolContract = {
 };
 
 describe('pool service', () => {
-    describe('useGasTaxCommission hook', () => {
-        it('should return default initial values when fee is undefined', () => {
-            mockedUseGasTaxCommissionContract.mockReturnValue(undefined);
-
-            const { result } = renderHook(() => useGasTaxCommission(address));
-
-            expect(result.current.gas).toBe(undefined);
-            expect(result.current.maxRaise).toBe(undefined);
-            expect(result.current.timeoutTimestamp).toBe(undefined);
-            expect(result.current.raiseTimeout).toBe(undefined);
-        });
-
-        it('should set a transaction when changing gas', async () => {
-            mockedUseGasTaxCommissionContract.mockReturnValue(
-                gasTaxCommissionContract as unknown as GasTaxCommission
-            );
-            const mockedSet = jest.fn();
-            mockedUseTransaction.mockReturnValue({
-                set: mockedSet,
-            } as unknown as Transaction<any>);
-            const { result } = renderHook(() => useGasTaxCommission(address));
-            await act(async () => {
-                result.current.changeGas(1000);
-            });
-            expect(mockedSet).toHaveBeenCalled();
-        });
-
-        it('should set correct values when fee is defined', async () => {
-            const gas = BigNumber.from('1000');
-            const raiseTimeout = BigNumber.from('10000000');
-            const maxRaise = BigNumber.from('1000000000');
-            const timeoutTimestamp = BigNumber.from('10000');
-            mockedUseGasTaxCommissionContract.mockReturnValue({
-                setGas: jest.fn(),
-                gas: () => Promise.resolve(gas),
-                feeRaiseTimeout: () => Promise.resolve(raiseTimeout),
-                maxRaise: () => Promise.resolve(maxRaise),
-                timeoutTimestamp: () => Promise.resolve(timeoutTimestamp),
-            } as unknown as GasTaxCommission);
-
-            const { result } = renderHook(() => useGasTaxCommission(address));
-
-            await waitFor(() => {
-                expect(result.current.gas).toStrictEqual(gas);
-                expect(result.current.raiseTimeout).toStrictEqual(raiseTimeout);
-                expect(result.current.maxRaise).toStrictEqual(maxRaise);
-                expect(result.current.timeoutTimestamp).toStrictEqual(
-                    new Date(timeoutTimestamp.toNumber() * 1000)
-                );
-            });
-        });
-    });
-
     describe('useFlatRateCommission hook', () => {
         it('should return default initial values when fee is undefined', () => {
             mockedUseFlatRateCommissionContract.mockReturnValue(undefined);

apps/staking/__tests__/utils/messages.test.tsx

@@ -264,15 +264,6 @@ describe('useMessages hook', () => {
                     'This model calculates the commission as a fixed percentage of the block CTSI reward before distributing the remaining amount to the pool users.'
                 );
             });
-
-            it('should return a message of how gas-based works', () => {
-                const { result } = renderHook(() =>
-                    useMessages('commission.model.gasBased.howItWorks')
-                );
-                expect(result.current).toEqual(
-                    'This model calculates the commission considering the current network gas price, Ethereum price and CTSI price. The configured amount of gas above is multiplied by the gas price provided by a ChainLink oracle, then converted from ETH to CTSI using an Uniswap V2 price oracle.'
-                );
-            });
         });
     });
 

apps/staking/package.json

@@ -11,8 +11,8 @@
         "lint:fix": "yarn lint --fix",
         "start": "next start",
         "storybook": "start-storybook -p 6006",
-        "test": "jest",
-        "test:ci": "jest --runInBand --coverage"
+        "test": "dotenv -c test -- jest",
+        "test:ci": "dotenv -c test jest --runInBand --coverage"
     },
     "dependencies": {
         "@apollo/client": "3.4.13",

apps/staking/src/components/pools/PoolCommission.tsx

@@ -9,9 +9,9 @@
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 // PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
-import React, { FC } from 'react';
-import { Flex, HStack, SystemProps, Text, TextProps } from '@chakra-ui/react';
 import { Icon } from '@chakra-ui/icons';
+import { Flex, HStack, SystemProps, Text, TextProps } from '@chakra-ui/react';
+import { FC } from 'react';
 import { IconType } from 'react-icons';
 import { StakingPool } from '../../graphql/models';
 
@@ -33,9 +33,7 @@ const PoolCommission: FC<PoolCommissionProps> = (props) => {
         pool.commissionPercentage !== null
             ? numberFormat.format(pool.commissionPercentage)
             : '-';
-    const commissionLabel = pool.fee.commission
-        ? `${(pool.fee.commission / 100).toFixed(2)} %`
-        : `${pool.fee.gas} Gas`;
+    const commissionLabel = `${(pool.fee.commission / 100).toFixed(2)} %`;
 
     const valueLabel = `${accruedCommissionLabel} (${commissionLabel})`;
     return (

apps/staking/src/components/pools/fee/CommissionForm.tsx

@@ -9,7 +9,6 @@
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 // PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
-import { FC, useEffect, useMemo } from 'react';
 import {
     Alert,
     Button,
@@ -18,18 +17,19 @@ import {
     FormHelperText,
     FormLabel,
     HStack,
-    Text,
-    VStack,
     Input,
     InputGroup,
     InputRightAddon,
+    Text,
+    VStack,
 } from '@chakra-ui/react';
-import { useForm } from 'react-hook-form';
 import humanizeDuration from 'humanize-duration';
+import { FC, useEffect, useMemo } from 'react';
+import { useForm } from 'react-hook-form';
 
 export interface CommissionFormProps {
     currentValue: number; // current value
-    unit: string; // unit: '%' | 'gas'
+    unit: string; // unit: '%'
     min?: number; // minimum value
     max?: number; // maximum value
     maxRaise: number; // max raise of the value

apps/staking/src/components/stake/CommissionForm.tsx

@@ -33,7 +33,7 @@ import { useForm } from 'react-hook-form';
 
 export interface CommissionFormProps {
     currentValue: number;
-    unit: '%' | 'gas';
+    unit: '%';
     min?: number;
     max?: number;
     maxRaise: number;

apps/staking/src/components/stake/PoolSetting.tsx

@@ -40,7 +40,6 @@ import { FC } from 'react';
 import { useForm } from 'react-hook-form';
 import { FaBalanceScaleLeft } from 'react-icons/fa';
 import FlatRateContainer from '../../containers/stake/FlatRateContainer';
-import GasTaxContainer from '../../containers/stake/GasTaxContainer';
 import useStakingPoolQuery from '../../graphql/hooks/useStakingPool';
 import { useStakingPool } from '../../services/pool';
 import { useStakingPoolFactory } from '../../services/poolFactory';
@@ -129,12 +128,6 @@ export const PoolSetting: FC<PoolSettingsProps> = ({ address }) => {
         pool.amounts?.stake > BigNumber.from(0) ||
         pool.amounts?.unstake > BigNumber.from(0) ||
         pool.amounts?.withdraw > BigNumber.from(0);
-    const feeType =
-        stakingPool?.fee?.commission !== null
-            ? 'flatRate'
-            : stakingPool?.fee?.gas !== null
-            ? 'gasTax'
-            : undefined;
     const isRebalancing = pool.rebalanceTransaction?.isOngoing;
     const isRebalanceButtonDisabled = !isRebalanceEnabled || isRebalancing;
     const hasSamePoS = isSamePoS(pool.pos, poolFactory.pos);
@@ -297,19 +290,10 @@ export const PoolSetting: FC<PoolSettingsProps> = ({ address }) => {
                 </Notification>
             )}
 
-            {feeType == 'flatRate' && (
-                <FlatRateContainer
-                    pool={address}
-                    alertMessage={wordingFor.commission}
-                />
-            )}
-
-            {feeType == 'gasTax' && (
-                <GasTaxContainer
-                    pool={address}
-                    alertMessage={wordingFor.commission}
-                />
-            )}
+            <FlatRateContainer
+                pool={address}
+                alertMessage={wordingFor.commission}
+            />
 
             <Stack
                 justifySelf="flex-end"

apps/staking/src/components/stake/components/WalletBalanceSection.tsx

@@ -42,7 +42,6 @@ export const WalletBalanceSection: FC<IWalletBalanceSectionProps> = ({
     const { isGnosisSafe } = useWallet();
     const ethInfoMessage = useMessages('balance.eth.available.forGasCosts');
     const iconColor = useColorModeValue('light.primary', 'dark.primary');
-    const iconBg = useColorModeValue('dark.gray.senary', 'dark.gray.primary');
     const warningIconColor = useColorModeValue(
         'light.support.warning',
         'white'

apps/staking/src/components/stake/tables/PoolPerformanceTableRow.tsx

@@ -9,7 +9,6 @@
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 // PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
-import { FC, useState } from 'react';
 import { LockIcon } from '@chakra-ui/icons';
 import {
     Box,
@@ -25,6 +24,7 @@ import {
 import { Address, StakeIcon } from '@explorer/ui';
 import { first, last } from 'lodash/fp';
 import NextLink from 'next/link';
+import { FC, useState } from 'react';
 import { StakingPool } from '../../../graphql/models';
 import labels from '../../../utils/labels';
 import { formatCTSI } from '../../../utils/token';
@@ -92,29 +92,11 @@ const PoolPerformanceTableRow: FC<PoolPerformanceTableRowProps> = ({
             ? numberFormat.format(pool.commissionPercentage)
             : '-';
 
-    let flatRate = pool.fee.commission > 0;
-    const gasTax = pool.fee.gas > 0;
-
-    // XXX: if both are zero, currently we don't which is it, for now let's assume it's flat rate
-    if (!flatRate && !gasTax) {
-        flatRate = true;
-    }
-
     // commission label
-    let commissionLabel = '';
-    if (flatRate) {
-        commissionLabel = `${(pool.fee.commission / 100).toFixed(2)} %`;
-    } else if (gasTax) {
-        commissionLabel = `${pool.fee.gas} Gas`;
-    }
+    const commissionLabel = `${(pool.fee.commission / 100).toFixed(2)} %`;
 
     // commission help tooltip
-    let commissionTooltip: string = undefined;
-    if (flatRate) {
-        commissionTooltip = labels.flatRateCommission;
-    } else if (gasTax) {
-        commissionTooltip = labels.gasTaxCommission;
-    }
+    const commissionTooltip: string = labels.flatRateCommission;
 
     const [isHovered, setHovered] = useState(false);
     const backgroundColor = useColorModeValue('white', 'dark.gray.primary');