Skip to content

Commit 6cf1a26

Browse files
authored
Merge pull request #39 from codingknite/rollback-branch
Rollback branch
2 parents 662ccfc + 3cee246 commit 6cf1a26

File tree

7 files changed

+4607
-5648
lines changed

7 files changed

+4607
-5648
lines changed

lib/hooks/useWvmArchiver.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ const wvmNetworks = [
1616
wvm_rpc: 'https://testnet-rpc.wvm.dev',
1717
},
1818
{
19-
archive_pool_address: '0x0000000000000000000000000000000000000000',
20-
archiver_address: '0xd730fF10Ab359Fc4C0853DF9d108b7E646e645f4',
19+
archive_pool_address: '0xa2A0D977847805fE224B789D8C4d3D711ab251e7',
20+
archiver_address: '0x197f818c1313DC58b32D88078ecdfB40EA822614',
2121
backfill_address: '0x123463a4B065722E99115D6c222f267d9cABb524',
2222
block_time: 9.0,
2323
name: 'Metis',

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"node": ">=20.11.0",
88
"npm": "10.2.4"
99
},
10-
"license": "MIT",
10+
"license":"MIT",
1111
"scripts": {
1212
"dev": "./tools/scripts/dev.sh",
1313
"dev:preset": "./tools/scripts/dev.preset.sh",
@@ -99,7 +99,6 @@
9999
"react-dom": "18.2.0",
100100
"react-google-recaptcha": "^2.1.0",
101101
"react-hook-form": "^7.33.1",
102-
"react-icons": "^5.3.0",
103102
"react-identicons": "^1.2.5",
104103
"react-intersection-observer": "^9.5.2",
105104
"react-jazzicon": "^1.0.4",

pages/_app.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ function MyApp({ Component, pageProps }: AppPropsWithLayout) {
5353
}, []);
5454

5555
const getLayout = Component.getLayout ?? ((page) => <Layout>{ page }</Layout>);
56+
// const isUnderMaintenance = true;
57+
58+
// if (isUnderMaintenance) {
59+
// return <div>Under Maintenance</div>;
60+
// }
5661

5762
return (
5863
<ChakraProvider cookies={ pageProps.cookies }>

ui/block/BlockDetails.tsx

Lines changed: 117 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import BigNumber from 'bignumber.js';
1414
import capitalize from 'lodash/capitalize';
1515
import { useRouter } from 'next/router';
1616
import React from 'react';
17-
import { TbCoins } from 'react-icons/tb';
1817
import { RotatingLines } from 'react-loader-spinner';
1918
import { scroller, Element } from 'react-scroll';
2019

@@ -955,21 +954,132 @@ const BlockDetails = ({ query }: Props) => {
955954
<DetailsInfoItem.Label
956955
hint={ `Amount of ${
957956
config.chain.currency.symbol || 'native token'
958-
} burned from transactions included in the block.
957+
} burned from transactions included in the block.
958+
} burned from transactions included in the block.
959+
} burned from transactions included in the block.
960+
} burned from transactions included in the block.
961+
} burned from transactions included in the block.
962+
} burned from transactions included in the block.
963+
} burned from transactions included in the block.
964+
} burned from transactions included in the block.
965+
} burned from transactions included in the block.
966+
} burned from transactions included in the block.
967+
} burned from transactions included in the block.
968+
} burned from transactions included in the block.
969+
} burned from transactions included in the block.
970+
} burned from transactions included in the block.
971+
} burned from transactions included in the block.
972+
} burned from transactions included in the block.
973+
} burned from transactions included in the block.
974+
} burned from transactions included in the block.
975+
} burned from transactions included in the block.
976+
} burned from transactions included in the block.
977+
} burned from transactions included in the block.
978+
} burned from transactions included in the block.
979+
} burned from transactions included in the block.
980+
} burned from transactions included in the block.
981+
} burned from transactions included in the block.
982+
} burned from transactions included in the block.
983+
} burned from transactions included in the block.
984+
} burned from transactions included in the block.
985+
} burned from transactions included in the block.
986+
} burned from transactions included in the block.
987+
} burned from transactions included in the block.
988+
} burned from transactions included in the block.
989+
} burned from transactions included in the block.
990+
} burned from transactions included in the block.
991+
} burned from transactions included in the block.
992+
} burned from transactions included in the block.
993+
} burned from transactions included in the block.
994+
} burned from transactions included in the block.
995+
} burned from transactions included in the block.
996+
} burned from transactions included in the block.
997+
} burned from transactions included in the block.
998+
} burned from transactions included in the block.
999+
} burned from transactions included in the block.
1000+
} burned from transactions included in the block.
1001+
} burned from transactions included in the block.
1002+
} burned from transactions included in the block.
1003+
} burned from transactions included in the block.
1004+
} burned from transactions included in the block.
1005+
} burned from transactions included in the block.
1006+
} burned from transactions included in the block.
1007+
} burned from transactions included in the block.
1008+
} burned from transactions included in the block.
1009+
} burned from transactions included in the block.
1010+
} burned from transactions included in the block.
1011+
} burned from transactions included in the block.
1012+
} burned from transactions included in the block.
1013+
} burned from transactions included in the block.
1014+
} burned from transactions included in the block.
1015+
} burned from transactions included in the block.
1016+
} burned from transactions included in the block.
1017+
} burned from transactions included in the block.
1018+
} burned from transactions included in the block.
1019+
} burned from transactions included in the block.
1020+
} burned from transactions included in the block.
1021+
} burned from transactions included in the block.
1022+
} burned from transactions included in the block.
1023+
} burned from transactions included in the block.
1024+
} burned from transactions included in the block.
1025+
} burned from transactions included in the block.
1026+
} burned from transactions included in the block.
1027+
} burned from transactions included in the block.
1028+
} burned from transactions included in the block.
1029+
} burned from transactions included in the block.
1030+
} burned from transactions included in the block.
1031+
} burned from transactions included in the block.
1032+
} burned from transactions included in the block.
1033+
} burned from transactions included in the block.
1034+
} burned from transactions included in the block.
1035+
} burned from transactions included in the block.
1036+
} burned from transactions included in the block.
1037+
} burned from transactions included in the block.
1038+
} burned from transactions included in the block.
1039+
} burned from transactions included in the block.
1040+
} burned from transactions included in the block.
1041+
} burned from transactions included in the block.
1042+
} burned from transactions included in the block.
1043+
} burned from transactions included in the block.
1044+
} burned from transactions included in the block.
1045+
} burned from transactions included in the block.
1046+
} burned from transactions included in the block.
1047+
} burned from transactions included in the block.
1048+
} burned from transactions included in the block.
1049+
} burned from transactions included in the block.
1050+
} burned from transactions included in the block.
1051+
} burned from transactions included in the block.
1052+
} burned from transactions included in the block.
1053+
} burned from transactions included in the block.
1054+
} burned from transactions included in the block.
1055+
} burned from transactions included in the block.
1056+
} burned from transactions included in the block.
1057+
} burned from transactions included in the block.
1058+
} burned from transactions included in the block.
1059+
} burned from transactions included in the block.
1060+
} burned from transactions included in the block.
1061+
} burned from transactions included in the block.
1062+
} burned from transactions included in the block.
1063+
} burned from transactions included in the block.
1064+
} burned from transactions included in the block.
1065+
} burned from transactions included in the block.
9591066
Equals Block Base Fee per Gas * Gas Used` }
9601067
isLoading={ isPlaceholderData }
9611068
>
962-
Network revenue
1069+
Burnt fees
9631070
</DetailsInfoItem.Label>
9641071
<DetailsInfoItem.Value>
965-
<Skeleton isLoaded={ !isPlaceholderData } display="inline-block">
966-
<TbCoins size={ 20 } color="gray.500"/>
967-
</Skeleton>
1072+
<IconSvg
1073+
name="flame"
1074+
boxSize={ 5 }
1075+
color="gray.500"
1076+
isLoading={ isPlaceholderData }
1077+
/>
9681078
<Skeleton isLoaded={ !isPlaceholderData } ml={ 2 }>
9691079
{ burntFees.dividedBy(WEI).toFixed() } { currencyUnits.ether }
9701080
</Skeleton>
9711081
{ !txFees.isEqualTo(ZERO) && (
972-
<Tooltip label="Network revenue / Txn fees * 100%">
1082+
<Tooltip label="Burnt fees / Txn fees * 100%">
9731083
<Box>
9741084
<Utilization
9751085
ml={ 4 }

ui/snippets/networkMenu/NetworkLogo.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ const LogoFallback = ({
5858
name={ isSmall ? `${ iconPath }` : `${ logoPath }` }
5959
width="auto"
6060
height="100%"
61-
color={ colorMode === 'dark' ? 'whiteAlpha.400' : 'blackAlpha.400' }
6261
display={ display }
6362
/>
6463
);

ui/tx/details/TxDetailsBurntFees.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
import { Skeleton } from '@chakra-ui/react';
21
import BigNumber from 'bignumber.js';
32
import React from 'react';
4-
import { TbCoins } from 'react-icons/tb';
53

64
import type { Transaction } from 'types/api/transaction';
75

86
import { ZERO } from 'lib/consts';
97
import { currencyUnits } from 'lib/units';
108
import CurrencyValue from 'ui/shared/CurrencyValue';
119
import * as DetailsInfoItem from 'ui/shared/DetailsInfoItem';
10+
import IconSvg from 'ui/shared/IconSvg';
1211

1312
interface Props {
1413
data: Transaction;
@@ -32,7 +31,7 @@ const TxDetailsBurntFees = ({ data, isLoading }: Props) => {
3231
` }
3332
isLoading={ isLoading }
3433
>
35-
Network revenue
34+
Burnt fees
3635
</DetailsInfoItem.Label>
3736
<DetailsInfoItem.Value>
3837
<Skeleton isLoaded={ !isLoading } display="inline-block">

0 commit comments

Comments
 (0)