mirror of
https://github.com/luxfi/explore.git
synced 2026-09-24 00:28:18 +00:00
Merge pull request #2532 from blockscout/release/v1-37-5
Release v1.37.5
This commit is contained in:
@@ -1098,7 +1098,7 @@ export const RESOURCES = {
|
||||
advanced_filter: {
|
||||
path: '/api/v2/advanced-filters',
|
||||
filterFields: [
|
||||
'tx_types' as const,
|
||||
'transaction_types' as const,
|
||||
'methods' as const,
|
||||
'methods_names' as const /* frontend only */,
|
||||
'age_from' as const,
|
||||
|
||||
+2
-2
@@ -60,7 +60,7 @@ export const base: Transaction = {
|
||||
},
|
||||
token_transfers: [],
|
||||
token_transfers_overflow: false,
|
||||
tx_burnt_fee: '461030000000000',
|
||||
transaction_burnt_fee: '461030000000000',
|
||||
transaction_tag: null,
|
||||
transaction_types: [
|
||||
'contract_call',
|
||||
@@ -196,7 +196,7 @@ export const pending: Transaction = {
|
||||
revert_reason: null,
|
||||
status: null,
|
||||
timestamp: null,
|
||||
tx_burnt_fee: null,
|
||||
transaction_burnt_fee: null,
|
||||
transaction_tag: null,
|
||||
type: null,
|
||||
value: '0',
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ export const TX: Transaction = {
|
||||
type: 0,
|
||||
exchange_rate: '1828.71',
|
||||
to: ADDRESS_PARAMS,
|
||||
tx_burnt_fee: null,
|
||||
transaction_burnt_fee: null,
|
||||
max_fee_per_gas: null,
|
||||
result: 'success',
|
||||
hash: '0x2b824349b320cfa72f292ab26bf525adb00083ba9fa097141896c3c8c74567cc',
|
||||
|
||||
@@ -2,7 +2,7 @@ import type { AddressParam } from './addressParams';
|
||||
import type { TokenInfo } from './token';
|
||||
|
||||
export type AdvancedFilterParams = {
|
||||
tx_types?: Array<AdvancedFilterType>;
|
||||
transaction_types?: Array<AdvancedFilterType>;
|
||||
methods?: Array<string>;
|
||||
methods_names?: Array<string>; /* frontend only */
|
||||
age_from?: string;
|
||||
|
||||
@@ -45,7 +45,7 @@ export type Transaction = {
|
||||
max_priority_fee_per_gas: string | null;
|
||||
priority_fee: string | null;
|
||||
base_fee_per_gas: string | null;
|
||||
tx_burnt_fee: string | null;
|
||||
transaction_burnt_fee: string | null;
|
||||
nonce: number;
|
||||
position: number | null;
|
||||
revert_reason: TransactionRevertReason | null;
|
||||
|
||||
@@ -18,7 +18,7 @@ const columns: Array<ColumnsIds> = [
|
||||
];
|
||||
|
||||
const filters = {
|
||||
tx_types: [ 'coin_transfer' as const ],
|
||||
transaction_types: [ 'coin_transfer' as const ],
|
||||
methods: [ '0xa9059cbb' ],
|
||||
age: '7d' as const,
|
||||
address_relation: 'or' as const,
|
||||
|
||||
@@ -29,7 +29,7 @@ const FilterByColumn = ({ column, filters, columnName, handleFilterChange, searc
|
||||
const commonProps = { columnName, handleFilterChange, isLoading };
|
||||
switch (column) {
|
||||
case 'type': {
|
||||
const value = filters.tx_types;
|
||||
const value = filters.transaction_types;
|
||||
return (
|
||||
<TableColumnFilterWrapper
|
||||
columnName="Type"
|
||||
|
||||
@@ -11,7 +11,7 @@ import { ADVANCED_FILTER_TYPES_WITH_ALL } from '../constants';
|
||||
|
||||
const RESET_VALUE = 'all';
|
||||
|
||||
const FILTER_PARAM = 'tx_types';
|
||||
const FILTER_PARAM = 'transaction_types';
|
||||
|
||||
type Props = {
|
||||
value?: Array<AdvancedFilterType>;
|
||||
|
||||
@@ -52,7 +52,7 @@ const filterParamNames: Record<keyof AdvancedFilterParams, string> = {
|
||||
token_contract_symbols_to_exclude: '',
|
||||
token_contract_address_hashes_to_include: 'Asset',
|
||||
token_contract_symbols_to_include: '',
|
||||
tx_types: 'Type',
|
||||
transaction_types: 'Type',
|
||||
};
|
||||
|
||||
export function getFilterTags(filters: AdvancedFilterParams) {
|
||||
@@ -76,7 +76,7 @@ export function getFilterTags(filters: AdvancedFilterParams) {
|
||||
valueStr = getFilterValueWithNames(filtersToShow.methods, filtersToShow.methods_names);
|
||||
break;
|
||||
}
|
||||
case 'tx_types': {
|
||||
case 'transaction_types': {
|
||||
valueStr = castArray(value).map(i => ADVANCED_FILTER_TYPES.find(t => t.id === i)?.name).filter(Boolean).join(', ');
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@ export default function useBlockTxsQuery({ heightOrHash, blockQuery, tab }: Para
|
||||
created_contract: null,
|
||||
result: '',
|
||||
priority_fee: null,
|
||||
tx_burnt_fee: null,
|
||||
transaction_burnt_fee: null,
|
||||
revert_reason: null,
|
||||
decoded_input: null,
|
||||
has_error_in_internal_transactions: null,
|
||||
|
||||
@@ -54,7 +54,7 @@ const AdvancedFilter = () => {
|
||||
const [ filters, setFilters ] = React.useState<AdvancedFilterParams>(() => {
|
||||
const age = getFilterValueFromQuery(ADVANCED_FILTER_AGES, router.query.age);
|
||||
return {
|
||||
tx_types: getFilterValuesFromQuery(ADVANCED_FILTER_TYPES, router.query.tx_types),
|
||||
transaction_types: getFilterValuesFromQuery(ADVANCED_FILTER_TYPES, router.query.transaction_types),
|
||||
methods: getValuesArrayFromQuery(router.query.methods),
|
||||
methods_names: getValuesArrayFromQuery(router.query.methods_names),
|
||||
amount_from: getQueryParamString(router.query.amount_from),
|
||||
|
||||
@@ -103,7 +103,7 @@ const TxDetailsDegraded = ({ hash, txQuery }: Props) => {
|
||||
null,
|
||||
result: '',
|
||||
priority_fee: null,
|
||||
tx_burnt_fee: null,
|
||||
transaction_burnt_fee: null,
|
||||
revert_reason: null,
|
||||
decoded_input: null,
|
||||
has_error_in_internal_transactions: null,
|
||||
|
||||
@@ -23,7 +23,7 @@ const TxDetailsBurntFees = ({ data, isLoading }: Props) => {
|
||||
return null;
|
||||
}
|
||||
|
||||
const value = BigNumber(data.tx_burnt_fee || 0).plus(BigNumber(data.blob_gas_used || 0).multipliedBy(BigNumber(data.blob_gas_price || 0)));
|
||||
const value = BigNumber(data.transaction_burnt_fee || 0).plus(BigNumber(data.blob_gas_used || 0).multipliedBy(BigNumber(data.blob_gas_price || 0)));
|
||||
|
||||
if (value.isEqualTo(ZERO)) {
|
||||
return null;
|
||||
|
||||
Reference in New Issue
Block a user