Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
@tak1827
tak1827 committed Mar 9, 2024
1 parent 45494ef commit 5328fd6
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 154 deletions.
75 changes: 35 additions & 40 deletions src/components/organisms/checkDepositModal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@ type Props = {
};

export const CheckDepositModal = (props: Props) => {
const {
className,
ownerAddress,
setModalState,
isLegacy,
} = props;
const { className, ownerAddress, setModalState, isLegacy } = props;

const [checkSuccess, setCheckSuccess] = useState('');
const [isChecking, setIsChecking] = useState(false);
Expand All @@ -33,9 +28,16 @@ export const CheckDepositModal = (props: Props) => {

try {
setIsChecking(true);
const depositTotal: ethers.BigNumber = await L1BuildDepositContract.getDepositTotal(builder);
const depositOAS: ethers.BigNumber = await L1BuildDepositContract.getDepositAmount(builder, ownerAddress);
const depositSOAS: ethers.BigNumber = await L1BuildDepositContract.getDepositERC20Amount(builder, ownerAddress, sOASAddress);
const depositTotal: ethers.BigNumber =
await L1BuildDepositContract.getDepositTotal(builder);
const depositOAS: ethers.BigNumber =
await L1BuildDepositContract.getDepositAmount(builder, ownerAddress);
const depositSOAS: ethers.BigNumber =
await L1BuildDepositContract.getDepositERC20Amount(
builder,
ownerAddress,
sOASAddress,
);

setDepositTotal(depositTotal);
setDepositOAS(depositOAS);
Expand All @@ -54,7 +56,9 @@ export const CheckDepositModal = (props: Props) => {
{
placeholder: 'set builder address',
value: builder,
handleClick: (e: ChangeEvent<HTMLInputElement>) => {setBuilder(e.target.value)},
handleClick: (e: ChangeEvent<HTMLInputElement>) => {
setBuilder(e.target.value);
},
},
];

Expand All @@ -63,39 +67,30 @@ export const CheckDepositModal = (props: Props) => {
handleClick: check,
disabled: !builder || isChecking,
value: 'Check Deposit',
}
},
];

return (
<>
{isChecking &&
<LoadingModal />
}
{!isChecking &&
<Modal
setModalState={setModalState}
>
<div className='space-y-4'>
{checkSuccess && (
<SuccessMsg className='w-full' text={checkSuccess} />
)}
{checkError && (
<ErrorMsg className='w-full' text={ checkError } />
)}
<Form
inputs={inputs}
buttons={buttons}
/>
{depositTotal && depositOAS && depositSOAS &&
<DepositDetail
depositTotal={depositTotal}
depositOAS={depositOAS}
depositSOAS={depositSOAS}
/>
}
</div>
</Modal>
}
{isChecking && <LoadingModal />}
{!isChecking && (
<Modal setModalState={setModalState}>
<div className='space-y-4'>
{checkSuccess && (
<SuccessMsg className='w-full' text={checkSuccess} />
)}
{checkError && <ErrorMsg className='w-full' text={checkError} />}
<Form inputs={inputs} buttons={buttons} />
{depositTotal && depositOAS && depositSOAS && (
<DepositDetail
depositTotal={depositTotal}
depositOAS={depositOAS}
depositSOAS={depositSOAS}
/>
)}
</div>
</Modal>
)}
</>
)
);
};
135 changes: 39 additions & 96 deletions src/components/organisms/verseInfoV2.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import clsx from 'clsx';
import { ErrorMsg, Button, Table } from '@/components/atoms';
import { useCallback, useState } from 'react';
import { download, handleError } from '@/features';
import { VerseInfoV2 as VerseInfoType, DeployConfig } from '@/types/optimism/verse';
import {
VerseInfoV2 as VerseInfoType,
DeployConfig,
} from '@/types/optimism/verse';
import { NamedAddressesV2 as NamedAddresses } from '@/types/oasysHub/verseBuild';

type Props = {
Expand All @@ -11,13 +14,8 @@ type Props = {
verseInfo: VerseInfoType;
};


export const VerseInfoV2 = (props: Props) => {
const {
className,
verseBuilder,
verseInfo,
} = props;
const { className, verseBuilder, verseInfo } = props;

const [downloadError, setDownloadError] = useState('');

Expand All @@ -37,108 +35,53 @@ export const VerseInfoV2 = (props: Props) => {
}
}, []);

const heads = [
'Config',
'Value'
];
const heads = ['Config', 'Value'];

const records = [
[
'Chain_id',
verseInfo.chainId.toString(),
],
[
'Builder',
verseBuilder,
],
[
'FinalSystemOwner',
verseInfo.namedAddresses.FinalSystemOwner,
],
[
'L2OutputOracleProposer',
verseInfo.namedAddresses.L2OutputOracleProposer,
],
['Chain_id', verseInfo.chainId.toString()],
['Builder', verseBuilder],
['FinalSystemOwner', verseInfo.namedAddresses.FinalSystemOwner],
['L2OutputOracleProposer', verseInfo.namedAddresses.L2OutputOracleProposer],
[
'L2OutputOracleChallenger',
verseInfo.namedAddresses.L2OutputOracleChallenger,
],
[
'BatchSender',
verseInfo.namedAddresses.BatchSender,
],
[
'ProxyAdmin',
verseInfo.namedAddresses.ProxyAdmin,
],
[
'SystemConfigProxy',
verseInfo.namedAddresses.SystemConfigProxy,
],
[
'L1StandardBridgeProxy',
verseInfo.namedAddresses.L1StandardBridgeProxy,
],
[
'L1ERC721BridgeProxy',
verseInfo.namedAddresses.L1ERC721BridgeProxy,
],
['BatchSender', verseInfo.namedAddresses.BatchSender],
['ProxyAdmin', verseInfo.namedAddresses.ProxyAdmin],
['SystemConfigProxy', verseInfo.namedAddresses.SystemConfigProxy],
['L1StandardBridgeProxy', verseInfo.namedAddresses.L1StandardBridgeProxy],
['L1ERC721BridgeProxy', verseInfo.namedAddresses.L1ERC721BridgeProxy],
[
'L1CrossDomainMessengerProxy',
verseInfo.namedAddresses.L1CrossDomainMessengerProxy,
],
[
'L2OutputOracleProxy',
verseInfo.namedAddresses.L2OutputOracleProxy,
],
[
'OptimismPortalProxy',
verseInfo.namedAddresses.OptimismPortalProxy,
],
[
'ProtocolVersions',
verseInfo.namedAddresses.ProtocolVersions,
],
[
'BatchInbox',
verseInfo.namedAddresses.BatchInbox,
],
[
'AddressManager',
verseInfo.namedAddresses.AddressManager,
],
[
'P2PSequencer',
verseInfo.namedAddresses.P2PSequencer,
],
['L2OutputOracleProxy', verseInfo.namedAddresses.L2OutputOracleProxy],
['OptimismPortalProxy', verseInfo.namedAddresses.OptimismPortalProxy],
['ProtocolVersions', verseInfo.namedAddresses.ProtocolVersions],
['BatchInbox', verseInfo.namedAddresses.BatchInbox],
['AddressManager', verseInfo.namedAddresses.AddressManager],
['P2PSequencer', verseInfo.namedAddresses.P2PSequencer],
];

return (
<div className={clsx(
className,
)}>
{downloadError && (
<ErrorMsg text={ downloadError } className='w-full' />
)}
<p>Download verse config</p>
<Table
heads={heads}
records={records}
/>
{verseInfo?.namedAddresses && verseInfo?.deployConfig &&
<div className="flex flex-col space-y-2">
<Button
handleClick={() => downloadAddresses(verseInfo.namedAddresses)}
>
Download address.json
</Button>
<Button
handleClick={() => downloadDeployConfig(verseInfo.deployConfig)}
>
Download deploy-config.json
</Button>
</div>
}
<div className={clsx(className)}>
{downloadError && <ErrorMsg text={downloadError} className='w-full' />}
<p>Download verse config</p>
<Table heads={heads} records={records} />
{verseInfo?.namedAddresses && verseInfo?.deployConfig && (
<div className='flex flex-col space-y-2'>
<Button
handleClick={() => downloadAddresses(verseInfo.namedAddresses)}
>
Download address.json
</Button>
<Button
handleClick={() => downloadDeployConfig(verseInfo.deployConfig)}
>
Download deploy-config.json
</Button>
</div>
)}
</div>
);
};
38 changes: 20 additions & 18 deletions src/consts/deployConfig.ts
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
export const BaseFeeVaultMinimumWithdrawalAmount = '0x8ac7230489e80000'
export const BaseFeeVaultWithdrawalNetwork = 0
export const ChannelTimeout = 300
export const Eip1559Denominator = 50
export const Eip1559DenominatorCanyon = 250
export const Eip1559Elasticity = 10
export const EnableGovernance = false
export const L1BlockTime = 15
export const L1FeeVaultMinimumWithdrawalAmount = '0x8ac7230489e80000'
export const L1FeeVaultWithdrawalNetwork = 0
export const L2GenesisBlockBaseFeePerGas = '0x0'
export const L2GenesisRegolithTimeOffset = '0x0'
export const MaxSequencerDrift = 600
export const RecommendedProtocolVersion = '0x0000000000000000000000000000000000000000000000000000000000000000'
export const RequiredProtocolVersion = '0x0000000000000000000000000000000000000000000000000000000000000000'
export const SequencerFeeVaultMinimumWithdrawalAmount = '0x8ac7230489e80000'
export const SequencerFeeVaultWithdrawalNetwork = 0
export const SequencerWindowSize = 3600
export const BaseFeeVaultMinimumWithdrawalAmount = '0x8ac7230489e80000';
export const BaseFeeVaultWithdrawalNetwork = 0;
export const ChannelTimeout = 300;
export const Eip1559Denominator = 50;
export const Eip1559DenominatorCanyon = 250;
export const Eip1559Elasticity = 10;
export const EnableGovernance = false;
export const L1BlockTime = 15;
export const L1FeeVaultMinimumWithdrawalAmount = '0x8ac7230489e80000';
export const L1FeeVaultWithdrawalNetwork = 0;
export const L2GenesisBlockBaseFeePerGas = '0x0';
export const L2GenesisRegolithTimeOffset = '0x0';
export const MaxSequencerDrift = 600;
export const RecommendedProtocolVersion =
'0x0000000000000000000000000000000000000000000000000000000000000000';
export const RequiredProtocolVersion =
'0x0000000000000000000000000000000000000000000000000000000000000000';
export const SequencerFeeVaultMinimumWithdrawalAmount = '0x8ac7230489e80000';
export const SequencerFeeVaultWithdrawalNetwork = 0;
export const SequencerWindowSize = 3600;

0 comments on commit 5328fd6

Please sign in to comment.