Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
a0a3b384
Unverified
Commit
a0a3b384
authored
Jan 24, 2025
by
tom goriunov
Committed by
GitHub
Jan 24, 2025
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2532 from blockscout/release/v1-37-5
Release v1.37.5
parents
c9606a18
6f19c4a1
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
15 additions
and
15 deletions
+15
-15
resources.ts
lib/api/resources.ts
+1
-1
tx.ts
mocks/txs/tx.ts
+2
-2
tx.ts
stubs/tx.ts
+1
-1
advancedFilter.ts
types/api/advancedFilter.ts
+1
-1
transaction.ts
types/api/transaction.ts
+1
-1
FilterByColumn.pw.tsx
ui/advancedFilter/FilterByColumn.pw.tsx
+1
-1
FilterByColumn.tsx
ui/advancedFilter/FilterByColumn.tsx
+1
-1
TypeFilter.tsx
ui/advancedFilter/filters/TypeFilter.tsx
+1
-1
lib.ts
ui/advancedFilter/lib.ts
+2
-2
useBlockTxsQuery.tsx
ui/block/useBlockTxsQuery.tsx
+1
-1
AdvancedFilter.tsx
ui/pages/AdvancedFilter.tsx
+1
-1
TxDetailsDegraded.tsx
ui/tx/TxDetailsDegraded.tsx
+1
-1
TxDetailsBurntFees.tsx
ui/tx/details/TxDetailsBurntFees.tsx
+1
-1
No files found.
lib/api/resources.ts
View file @
a0a3b384
...
@@ -1098,7 +1098,7 @@ export const RESOURCES = {
...
@@ -1098,7 +1098,7 @@ export const RESOURCES = {
advanced_filter
:
{
advanced_filter
:
{
path
:
'
/api/v2/advanced-filters
'
,
path
:
'
/api/v2/advanced-filters
'
,
filterFields
:
[
filterFields
:
[
'
t
x
_types
'
as
const
,
'
t
ransaction
_types
'
as
const
,
'
methods
'
as
const
,
'
methods
'
as
const
,
'
methods_names
'
as
const
/* frontend only */
,
'
methods_names
'
as
const
/* frontend only */
,
'
age_from
'
as
const
,
'
age_from
'
as
const
,
...
...
mocks/txs/tx.ts
View file @
a0a3b384
...
@@ -60,7 +60,7 @@ export const base: Transaction = {
...
@@ -60,7 +60,7 @@ export const base: Transaction = {
},
},
token_transfers
:
[],
token_transfers
:
[],
token_transfers_overflow
:
false
,
token_transfers_overflow
:
false
,
t
x
_burnt_fee
:
'
461030000000000
'
,
t
ransaction
_burnt_fee
:
'
461030000000000
'
,
transaction_tag
:
null
,
transaction_tag
:
null
,
transaction_types
:
[
transaction_types
:
[
'
contract_call
'
,
'
contract_call
'
,
...
@@ -196,7 +196,7 @@ export const pending: Transaction = {
...
@@ -196,7 +196,7 @@ export const pending: Transaction = {
revert_reason
:
null
,
revert_reason
:
null
,
status
:
null
,
status
:
null
,
timestamp
:
null
,
timestamp
:
null
,
t
x
_burnt_fee
:
null
,
t
ransaction
_burnt_fee
:
null
,
transaction_tag
:
null
,
transaction_tag
:
null
,
type
:
null
,
type
:
null
,
value
:
'
0
'
,
value
:
'
0
'
,
...
...
stubs/tx.ts
View file @
a0a3b384
...
@@ -19,7 +19,7 @@ export const TX: Transaction = {
...
@@ -19,7 +19,7 @@ export const TX: Transaction = {
type
:
0
,
type
:
0
,
exchange_rate
:
'
1828.71
'
,
exchange_rate
:
'
1828.71
'
,
to
:
ADDRESS_PARAMS
,
to
:
ADDRESS_PARAMS
,
t
x
_burnt_fee
:
null
,
t
ransaction
_burnt_fee
:
null
,
max_fee_per_gas
:
null
,
max_fee_per_gas
:
null
,
result
:
'
success
'
,
result
:
'
success
'
,
hash
:
'
0x2b824349b320cfa72f292ab26bf525adb00083ba9fa097141896c3c8c74567cc
'
,
hash
:
'
0x2b824349b320cfa72f292ab26bf525adb00083ba9fa097141896c3c8c74567cc
'
,
...
...
types/api/advancedFilter.ts
View file @
a0a3b384
...
@@ -2,7 +2,7 @@ import type { AddressParam } from './addressParams';
...
@@ -2,7 +2,7 @@ import type { AddressParam } from './addressParams';
import
type
{
TokenInfo
}
from
'
./token
'
;
import
type
{
TokenInfo
}
from
'
./token
'
;
export
type
AdvancedFilterParams
=
{
export
type
AdvancedFilterParams
=
{
t
x
_types
?:
Array
<
AdvancedFilterType
>
;
t
ransaction
_types
?:
Array
<
AdvancedFilterType
>
;
methods
?:
Array
<
string
>
;
methods
?:
Array
<
string
>
;
methods_names
?:
Array
<
string
>
;
/* frontend only */
methods_names
?:
Array
<
string
>
;
/* frontend only */
age_from
?:
string
;
age_from
?:
string
;
...
...
types/api/transaction.ts
View file @
a0a3b384
...
@@ -45,7 +45,7 @@ export type Transaction = {
...
@@ -45,7 +45,7 @@ export type Transaction = {
max_priority_fee_per_gas
:
string
|
null
;
max_priority_fee_per_gas
:
string
|
null
;
priority_fee
:
string
|
null
;
priority_fee
:
string
|
null
;
base_fee_per_gas
:
string
|
null
;
base_fee_per_gas
:
string
|
null
;
t
x
_burnt_fee
:
string
|
null
;
t
ransaction
_burnt_fee
:
string
|
null
;
nonce
:
number
;
nonce
:
number
;
position
:
number
|
null
;
position
:
number
|
null
;
revert_reason
:
TransactionRevertReason
|
null
;
revert_reason
:
TransactionRevertReason
|
null
;
...
...
ui/advancedFilter/FilterByColumn.pw.tsx
View file @
a0a3b384
...
@@ -18,7 +18,7 @@ const columns: Array<ColumnsIds> = [
...
@@ -18,7 +18,7 @@ const columns: Array<ColumnsIds> = [
];
];
const
filters
=
{
const
filters
=
{
t
x
_types
:
[
'
coin_transfer
'
as
const
],
t
ransaction
_types
:
[
'
coin_transfer
'
as
const
],
methods
:
[
'
0xa9059cbb
'
],
methods
:
[
'
0xa9059cbb
'
],
age
:
'
7d
'
as
const
,
age
:
'
7d
'
as
const
,
address_relation
:
'
or
'
as
const
,
address_relation
:
'
or
'
as
const
,
...
...
ui/advancedFilter/FilterByColumn.tsx
View file @
a0a3b384
...
@@ -29,7 +29,7 @@ const FilterByColumn = ({ column, filters, columnName, handleFilterChange, searc
...
@@ -29,7 +29,7 @@ const FilterByColumn = ({ column, filters, columnName, handleFilterChange, searc
const
commonProps
=
{
columnName
,
handleFilterChange
,
isLoading
};
const
commonProps
=
{
columnName
,
handleFilterChange
,
isLoading
};
switch
(
column
)
{
switch
(
column
)
{
case
'
type
'
:
{
case
'
type
'
:
{
const
value
=
filters
.
t
x
_types
;
const
value
=
filters
.
t
ransaction
_types
;
return
(
return
(
<
TableColumnFilterWrapper
<
TableColumnFilterWrapper
columnName=
"Type"
columnName=
"Type"
...
...
ui/advancedFilter/filters/TypeFilter.tsx
View file @
a0a3b384
...
@@ -11,7 +11,7 @@ import { ADVANCED_FILTER_TYPES_WITH_ALL } from '../constants';
...
@@ -11,7 +11,7 @@ import { ADVANCED_FILTER_TYPES_WITH_ALL } from '../constants';
const
RESET_VALUE
=
'
all
'
;
const
RESET_VALUE
=
'
all
'
;
const
FILTER_PARAM
=
'
t
x
_types
'
;
const
FILTER_PARAM
=
'
t
ransaction
_types
'
;
type
Props
=
{
type
Props
=
{
value
?:
Array
<
AdvancedFilterType
>
;
value
?:
Array
<
AdvancedFilterType
>
;
...
...
ui/advancedFilter/lib.ts
View file @
a0a3b384
...
@@ -52,7 +52,7 @@ const filterParamNames: Record<keyof AdvancedFilterParams, string> = {
...
@@ -52,7 +52,7 @@ const filterParamNames: Record<keyof AdvancedFilterParams, string> = {
token_contract_symbols_to_exclude
:
''
,
token_contract_symbols_to_exclude
:
''
,
token_contract_address_hashes_to_include
:
'
Asset
'
,
token_contract_address_hashes_to_include
:
'
Asset
'
,
token_contract_symbols_to_include
:
''
,
token_contract_symbols_to_include
:
''
,
t
x
_types
:
'
Type
'
,
t
ransaction
_types
:
'
Type
'
,
};
};
export
function
getFilterTags
(
filters
:
AdvancedFilterParams
)
{
export
function
getFilterTags
(
filters
:
AdvancedFilterParams
)
{
...
@@ -76,7 +76,7 @@ export function getFilterTags(filters: AdvancedFilterParams) {
...
@@ -76,7 +76,7 @@ export function getFilterTags(filters: AdvancedFilterParams) {
valueStr
=
getFilterValueWithNames
(
filtersToShow
.
methods
,
filtersToShow
.
methods_names
);
valueStr
=
getFilterValueWithNames
(
filtersToShow
.
methods
,
filtersToShow
.
methods_names
);
break
;
break
;
}
}
case
'
t
x
_types
'
:
{
case
'
t
ransaction
_types
'
:
{
valueStr
=
castArray
(
value
).
map
(
i
=>
ADVANCED_FILTER_TYPES
.
find
(
t
=>
t
.
id
===
i
)?.
name
).
filter
(
Boolean
).
join
(
'
,
'
);
valueStr
=
castArray
(
value
).
map
(
i
=>
ADVANCED_FILTER_TYPES
.
find
(
t
=>
t
.
id
===
i
)?.
name
).
filter
(
Boolean
).
join
(
'
,
'
);
break
;
break
;
}
}
...
...
ui/block/useBlockTxsQuery.tsx
View file @
a0a3b384
...
@@ -111,7 +111,7 @@ export default function useBlockTxsQuery({ heightOrHash, blockQuery, tab }: Para
...
@@ -111,7 +111,7 @@ export default function useBlockTxsQuery({ heightOrHash, blockQuery, tab }: Para
created_contract
:
null
,
created_contract
:
null
,
result
:
''
,
result
:
''
,
priority_fee
:
null
,
priority_fee
:
null
,
t
x
_burnt_fee
:
null
,
t
ransaction
_burnt_fee
:
null
,
revert_reason
:
null
,
revert_reason
:
null
,
decoded_input
:
null
,
decoded_input
:
null
,
has_error_in_internal_transactions
:
null
,
has_error_in_internal_transactions
:
null
,
...
...
ui/pages/AdvancedFilter.tsx
View file @
a0a3b384
...
@@ -54,7 +54,7 @@ const AdvancedFilter = () => {
...
@@ -54,7 +54,7 @@ const AdvancedFilter = () => {
const
[
filters
,
setFilters
]
=
React
.
useState
<
AdvancedFilterParams
>
(()
=>
{
const
[
filters
,
setFilters
]
=
React
.
useState
<
AdvancedFilterParams
>
(()
=>
{
const
age
=
getFilterValueFromQuery
(
ADVANCED_FILTER_AGES
,
router
.
query
.
age
);
const
age
=
getFilterValueFromQuery
(
ADVANCED_FILTER_AGES
,
router
.
query
.
age
);
return
{
return
{
t
x_types
:
getFilterValuesFromQuery
(
ADVANCED_FILTER_TYPES
,
router
.
query
.
tx
_types
),
t
ransaction_types
:
getFilterValuesFromQuery
(
ADVANCED_FILTER_TYPES
,
router
.
query
.
transaction
_types
),
methods
:
getValuesArrayFromQuery
(
router
.
query
.
methods
),
methods
:
getValuesArrayFromQuery
(
router
.
query
.
methods
),
methods_names
:
getValuesArrayFromQuery
(
router
.
query
.
methods_names
),
methods_names
:
getValuesArrayFromQuery
(
router
.
query
.
methods_names
),
amount_from
:
getQueryParamString
(
router
.
query
.
amount_from
),
amount_from
:
getQueryParamString
(
router
.
query
.
amount_from
),
...
...
ui/tx/TxDetailsDegraded.tsx
View file @
a0a3b384
...
@@ -103,7 +103,7 @@ const TxDetailsDegraded = ({ hash, txQuery }: Props) => {
...
@@ -103,7 +103,7 @@ const TxDetailsDegraded = ({ hash, txQuery }: Props) => {
null
,
null
,
result
:
''
,
result
:
''
,
priority_fee
:
null
,
priority_fee
:
null
,
t
x
_burnt_fee
:
null
,
t
ransaction
_burnt_fee
:
null
,
revert_reason
:
null
,
revert_reason
:
null
,
decoded_input
:
null
,
decoded_input
:
null
,
has_error_in_internal_transactions
:
null
,
has_error_in_internal_transactions
:
null
,
...
...
ui/tx/details/TxDetailsBurntFees.tsx
View file @
a0a3b384
...
@@ -23,7 +23,7 @@ const TxDetailsBurntFees = ({ data, isLoading }: Props) => {
...
@@ -23,7 +23,7 @@ const TxDetailsBurntFees = ({ data, isLoading }: Props) => {
return
null
;
return
null
;
}
}
const
value
=
BigNumber
(
data
.
t
x
_burnt_fee
||
0
).
plus
(
BigNumber
(
data
.
blob_gas_used
||
0
).
multipliedBy
(
BigNumber
(
data
.
blob_gas_price
||
0
)));
const
value
=
BigNumber
(
data
.
t
ransaction
_burnt_fee
||
0
).
plus
(
BigNumber
(
data
.
blob_gas_used
||
0
).
multipliedBy
(
BigNumber
(
data
.
blob_gas_price
||
0
)));
if
(
value
.
isEqualTo
(
ZERO
))
{
if
(
value
.
isEqualTo
(
ZERO
))
{
return
null
;
return
null
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment