Skip to content

Commit db3d446

Browse files
codingknitecodingknite
authored
Merge pull request #33 from codingknite/burnt-fees-fix
burnt-fees
2 parents 5c320a7 + a2de5ce commit db3d446

File tree

7 files changed

+23
-128
lines changed

7 files changed

+23
-128
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: '0xa2A0D977847805fE224B789D8C4d3D711ab251e7',
20-
archiver_address: '0x197f818c1313DC58b32D88078ecdfB40EA822614',
19+
archive_pool_address: '0x0000000000000000000000000000000000000000',
20+
archiver_address: '0xd730fF10Ab359Fc4C0853DF9d108b7E646e645f4',
2121
backfill_address: '0x123463a4B065722E99115D6c222f267d9cABb524',
2222
block_time: 9.0,
2323
name: 'Metis',

‎package.json

Lines changed: 2 additions & 1 deletion
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,6 +99,7 @@
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",
102103
"react-identicons": "^1.2.5",
103104
"react-intersection-observer": "^9.5.2",
104105
"react-jazzicon": "^1.0.4",

‎pages/_app.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ 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-
// }
6156

6257
return (
6358
<ChakraProvider cookies={ pageProps.cookies }>

‎ui/block/BlockDetails.tsx

Lines changed: 7 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ 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';
1718
import { RotatingLines } from 'react-loader-spinner';
1819
import { scroller, Element } from 'react-scroll';
1920

@@ -954,132 +955,21 @@ const BlockDetails = ({ query }: Props) => {
954955
<DetailsInfoItem.Label
955956
hint={ `Amount of ${
956957
config.chain.currency.symbol || 'native token'
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.
958+
} burned from transactions included in the block.
1066959
Equals Block Base Fee per Gas * Gas Used` }
1067960
isLoading={ isPlaceholderData }
1068961
>
1069-
Burnt fees
962+
Network revenue
1070963
</DetailsInfoItem.Label>
1071964
<DetailsInfoItem.Value>
1072-
<IconSvg
1073-
name="flame"
1074-
boxSize={ 5 }
1075-
color="gray.500"
1076-
isLoading={ isPlaceholderData }
1077-
/>
965+
<Skeleton isLoaded={ !isPlaceholderData } display="inline-block">
966+
<TbCoins size={ 20 } color="gray.500"/>
967+
</Skeleton>
1078968
<Skeleton isLoaded={ !isPlaceholderData } ml={ 2 }>
1079969
{ burntFees.dividedBy(WEI).toFixed() } { currencyUnits.ether }
1080970
</Skeleton>
1081971
{ !txFees.isEqualTo(ZERO) && (
1082-
<Tooltip label="Burnt fees / Txn fees * 100%">
972+
<Tooltip label="Network revenue / Txn fees * 100%">
1083973
<Box>
1084974
<Utilization
1085975
ml={ 4 }

‎ui/snippets/networkMenu/NetworkLogo.tsx

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

‎ui/tx/details/TxDetailsBurntFees.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import { Skeleton } from '@chakra-ui/react';
12
import BigNumber from 'bignumber.js';
23
import React from 'react';
4+
import { TbCoins } from 'react-icons/tb';
35

46
import type { Transaction } from 'types/api/transaction';
57

@@ -8,7 +10,6 @@ import { ZERO } from 'lib/consts';
810
import { currencyUnits } from 'lib/units';
911
import CurrencyValue from 'ui/shared/CurrencyValue';
1012
import * as DetailsInfoItem from 'ui/shared/DetailsInfoItem';
11-
import IconSvg from 'ui/shared/IconSvg';
1213

1314
const rollupFeature = config.features.rollup;
1415

@@ -38,10 +39,12 @@ const TxDetailsBurntFees = ({ data, isLoading }: Props) => {
3839
` }
3940
isLoading={ isLoading }
4041
>
41-
Burnt fees
42+
Network revenue
4243
</DetailsInfoItem.Label>
4344
<DetailsInfoItem.Value>
44-
<IconSvg name="flame" boxSize={ 5 } color="gray.500" isLoading={ isLoading }/>
45+
<Skeleton isLoaded={ !isLoading } display="inline-block">
46+
<TbCoins size={ 20 } color="gray.500"/>
47+
</Skeleton>
4548
<CurrencyValue
4649
value={ value.toString() }
4750
currency={ currencyUnits.ether }

‎yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14084,6 +14084,11 @@ react-hook-form@^7.33.1:
1408414084
resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.37.0.tgz#4d1738f092d3d8a3ade34ee892d97350b1032b19"
1408514085
integrity sha512-6NFTxsnw+EXSpNNvLr5nFMjPdYKRryQcelTHg7zwBB6vAzfPIcZq4AExP4heVlwdzntepQgwiOQW4z7Mr99Lsg==
1408614086

14087+
react-icons@^5.3.0:
14088+
version "5.3.0"
14089+
resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-5.3.0.tgz#ccad07a30aebd40a89f8cfa7d82e466019203f1c"
14090+
integrity sha512-DnUk8aFbTyQPSkCfF8dbX6kQjXA9DktMeJqfjrg6cK9vwQVMxmcA3BfP4QoiztVmEHtwlTgLFsPuH2NskKT6eg==
14091+
1408714092
react-identicons@^1.2.5:
1408814093
version "1.2.5"
1408914094
resolved "https://registry.yarnpkg.com/react-identicons/-/react-identicons-1.2.5.tgz#3502249e49d88f4e3500092694410a984bb102fa"

0 commit comments

Comments
 (0)