Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

W48 upstream merge #487

Closed
wants to merge 276 commits into from
Closed
Changes from 2 commits
Commits
Show all changes
276 commits
Select commit Hold shift + click to select a range
110e6f7
Merge pull request #4602 from blockscout/np-upd-keys-ga
vbaranov Sep 2, 2021
8ff386a
Add tooltips and names for fallback and receive functions
nikitosing Aug 31, 2021
fded776
Merge pull request #4592 from blockscout/np-fix-empty-function-names
vbaranov Sep 3, 2021
e9e7fa4
Ability to hide miner
vbaranov Sep 7, 2021
b230b4b
Merge pull request #4611 from blockscout/vb-hide-miner
vbaranov Sep 7, 2021
0a5377b
Improved style of transactions button
nikitosing Sep 6, 2021
ef321e5
Add token_tile_view_more.css to the main-page.css
nikitosing Sep 8, 2021
09acd33
Merge pull request #4608 from blockscout/np-change-txs-button
vbaranov Sep 8, 2021
ad67d53
Merge pull request #4615 from blockscout/np-fix-css-main-page
vbaranov Sep 8, 2021
82a8e26
Display token icons for tokens from TrustWallet repo
vbaranov Sep 2, 2021
bb29bda
token icon for bridged tokens in search results page fix
vbaranov Sep 9, 2021
553efba
Merge pull request #4596 from blockscout/vb-token-icon-bridged-with-m…
vbaranov Sep 9, 2021
8eac719
Hide error selector in the contract's functions list
nikitosing Sep 7, 2021
321729d
Merge pull request #4612 from blockscout/np-remove-error-selector
vbaranov Sep 9, 2021
c57e1d3
Change alpha of transactions button's background
nikitosing Sep 9, 2021
5d96530
Merge pull request #4622 from blockscout/np-change-alpha-for-txs-btn
vbaranov Sep 9, 2021
00dc48e
Support HTML tags in alert message
vbaranov Sep 9, 2021
619296b
Merge pull request #4624 from blockscout/vb-support-html-in-alert
vbaranov Sep 9, 2021
7acbf1a
Add implementation link to the overview of proxy contracts
nikitosing Sep 9, 2021
65456e0
Merge pull request #4625 from blockscout/np-add-implementation-link
vbaranov Sep 10, 2021
33f9094
Token page mobile view fix
vbaranov Sep 13, 2021
a4d0c33
Update CHANGELOG.md
vbaranov Sep 13, 2021
a9037ce
Merge pull request #4640 from blockscout/vb-token-address-mobile-view…
vbaranov Sep 14, 2021
c60b65e
Burned -> Burnt
nikitosing Sep 14, 2021
6b07db8
Refine view of popup for reverted tx
nikitosing Sep 9, 2021
6de856e
Merge pull request #4626 from blockscout/np-refine-view-error-tx
vbaranov Sep 15, 2021
a517abd
Merge pull request #4646 from blockscout/np-change-burned
vbaranov Sep 15, 2021
d4c4845
Add beacon contract address slot for proxy
nikitosing Sep 9, 2021
0ad74ee
Convert Burnt Fee to ether and add price in USD
nikitosing Sep 15, 2021
f81255b
Update overview.html.eex
vbaranov Sep 15, 2021
23bdd46
Merge pull request #4649 from blockscout/np-change-value-burnt-fee
vbaranov Sep 15, 2021
2cbfe01
Merge pull request #4621 from blockscout/np-add-beacon-slot-proxy
vbaranov Sep 15, 2021
5a97f6f
Change burn address to string
nikitosing Sep 16, 2021
6d4f37a
Merge pull request #4654 from blockscout/np-replace-burn-address-to-s…
vbaranov Sep 16, 2021
336ed83
EIP-3091 support (/tx/, /token/ paths)
vbaranov Sep 16, 2021
a4c5bfa
Merge pull request #4655 from blockscout/vb-routes-eip-3091
vbaranov Sep 16, 2021
7bee3e8
Open in Tenderly button
vbaranov Sep 16, 2021
f0087b6
Merge pull request #4656 from blockscout/vb-tenderly-button
vbaranov Sep 16, 2021
9e3246d
Update NPM packages
vbaranov Sep 17, 2021
adb3414
Merge pull request #4661 from blockscout/vb-update-npm-packages
vbaranov Sep 17, 2021
9b52c6b
Migrate to Elixir 1.12.x
vbaranov Sep 17, 2021
51d3900
Bump ex_keccak
vbaranov Sep 17, 2021
478af7d
Merge pull request #4663 from blockscout/vb-elixir-12
vbaranov Sep 18, 2021
b17d077
Add path for sources from Sourcify
nikitosing Sep 16, 2021
9879113
Merge pull request #4660 from blockscout/np-add-route-for-sources-sou…
vbaranov Sep 21, 2021
000861c
Improve categorization of smart-contracts' methods
nikitosing Sep 13, 2021
485fd68
Add type of contract to ajax request
nikitosing Sep 18, 2021
40aae23
Add field from to the eth_call
nikitosing Sep 19, 2021
8274e5d
Add docs, spec, small fix
nikitosing Sep 20, 2021
8e1b551
Merge pull request #4641 from blockscout/np-add-subclass-of-read-methods
vbaranov Sep 21, 2021
c2a44ce
Add expand/collapse button for long contract method data
nikitosing Sep 19, 2021
1511c28
Merge pull request #4667 from blockscout/np-hide-long-decoded-inputs
vbaranov Sep 21, 2021
b2114e3
Update CHANGELOG.md
vbaranov Sep 21, 2021
c2659ae
Fix css for dark theme
nikitosing Sep 20, 2021
083077e
Merge pull request #4668 from blockscout/np-fix-dark-theme-bugs
vbaranov Sep 21, 2021
a22d128
Internal transactions indexer: fix issue of some pending transactions…
vbaranov Sep 23, 2021
d7baa88
Fix timestamp for blocks pages
nikitosing Sep 22, 2021
ce02931
Merge pull request #4676 from blockscout/np-fix-timestamp
vbaranov Sep 23, 2021
c3a5c6e
Remove unused steps from Dockerfile
vbaranov Sep 23, 2021
0b67f81
Merge pull request #4681 from blockscout/vb-remove-unused-steps-from-…
vbaranov Sep 23, 2021
0dcdd43
fix duplicate entry
zalam003 Sep 23, 2021
6a4740f
Update mix deps
vbaranov Sep 23, 2021
9d56fb3
Merge pull request #4682 from blockscout/vb-update-mix-deps
vbaranov Sep 23, 2021
febe875
Merge pull request #4683 from zalam003/za-fix-transaction-scss
vbaranov Sep 23, 2021
3190b85
Block page: check gas limt value before division
vbaranov Sep 24, 2021
d352aad
Merge pull request #4686 from blockscout/vb-block-page-check-gas-limit
vbaranov Sep 24, 2021
edecc1d
fix blockscout web transaction overview token creation section
acoshift Sep 26, 2021
bee3da8
Merge pull request #4678 from blockscout/vb-internal-transactions-ind…
vbaranov Sep 27, 2021
4b8f7f7
CSP fix: allow only trustwallet assets repo from Github
vbaranov Sep 27, 2021
a40b0cd
Merge pull request #4693 from blockscout/vb-csp-fix
vbaranov Sep 27, 2021
879d6cd
Allow blockscout.com subdomains for ad
vbaranov Sep 27, 2021
18e3768
Update CHANGELOG with a missing row
vbaranov Sep 27, 2021
ee48f1e
Remove jdenticon script
vbaranov Sep 27, 2021
f558b1c
Merge pull request #4689 from acoshift/fix-transaction-overview
vbaranov Sep 27, 2021
94286f5
Fix internationalization files
vbaranov Sep 27, 2021
4046104
Fix pagination in Block Details, Transactions tab
nikitosing Sep 28, 2021
907a473
Update to Erlang/OTP 24
vbaranov Sep 28, 2021
43f9a24
Merge pull request #4704 from blockscout/vb-erlang-otp-24
vbaranov Sep 28, 2021
8f630da
Update Dockerfile
vbaranov Sep 29, 2021
3a7efb1
Top navigation: Move Accounts to Tokens
nikitosing Sep 29, 2021
ef6b401
Merge pull request #4707 from blockscout/np-move-addresses-tab
vbaranov Sep 30, 2021
c1dfc33
Merge pull request #4703 from blockscout/np-fix-block-txs-pagination
vbaranov Sep 30, 2021
9ca2814
Search input: sanitize input
vbaranov Oct 3, 2021
e3db332
Merge pull request #4713 from blockscout/vb-search-xss
vbaranov Oct 4, 2021
ef423b9
Contract verification fix: check only success creation tx
vbaranov Oct 4, 2021
5586497
Merge pull request #4717 from blockscout/vb-verify-contract-query-fix
vbaranov Oct 5, 2021
6de1546
Fix hardcoded strings
nikitosing Oct 6, 2021
7d5a05f
Merge pull request #4725 from blockscout/np-fix-hadcode-coin-name
vbaranov Oct 6, 2021
222d942
Update chart.js
vbaranov Oct 6, 2021
895e913
Merge pull request #4726 from blockscout/vb-update-chartjs
vbaranov Oct 7, 2021
089d078
Fix typo in naming
nikitosing Oct 8, 2021
b3e3cb6
Merge pull request #4733 from blockscout/np-fix-proxy-querying-methods
vbaranov Oct 8, 2021
be6c0e8
Fix fees for zero gas price txs
nikitosing Oct 8, 2021
11d663f
Merge pull request #4729 from blockscout/np-fix-zero-gas-price-burnt-fee
vbaranov Oct 8, 2021
d80b5ed
Remove clauses for outdated ganache bugs
nikitosing Oct 8, 2021
38e2db1
Add test for prepareMethodArgs; fix bug with whitespaces
nikitosing Oct 6, 2021
39f7037
Merge pull request #4735 from blockscout/np-code-clean-up-ganache-bugs
vbaranov Oct 11, 2021
0692487
Merge pull request #4711 from blockscout/np-fix-contract-inputs-error
vbaranov Oct 11, 2021
db4bf40
Vyper contract verification
vbaranov Jun 16, 2021
f08ad37
Merge pull request #4745 from blockscout/vb-premium-vyper-contracts-v…
vbaranov Oct 11, 2021
b6db2b0
Advanced CSV export
vbaranov Jan 25, 2021
711e36f
Fix comparison of decimal value
nikitosing Oct 11, 2021
a19fc50
Merge pull request #4747 from blockscout/vb-premium-csv-export-rebased
vbaranov Oct 11, 2021
79c11a9
Merge pull request #4746 from blockscout/np-fix-decimal-compare-gas-l…
vbaranov Oct 11, 2021
afc1c1e
Fix CSV export logs test
vbaranov Oct 12, 2021
a2a7e2a
Address page facelifting
vbaranov Sep 24, 2021
91f2e2f
Merge pull request #4699 from blockscout/vb-address-page-facelifting
vbaranov Oct 12, 2021
26a32ca
Update link and text: Bitmax -> AscendEX
nikitosing Oct 11, 2021
c28bc1f
Invalidate GA cache
vbaranov Oct 12, 2021
3b34658
Merge pull request #4751 from blockscout/np-change-text-trade-button
vbaranov Oct 12, 2021
df13fe3
Add possibility to decode input and logs based on other's SC method e…
nikitosing Oct 10, 2021
dd92450
Merge pull request #4739 from blockscout/np-improve-logs-and-inputs-d…
vbaranov Oct 13, 2021
fac9cc0
Complement for 1155
nikitosing Jul 30, 2021
6f6fa1c
Add ERC-1155 support for token transfers and token balances
ayrat555 Feb 14, 2020
5e5dc6e
fix tests
ayrat555 Feb 15, 2020
c685cd0
ERC-1155 transfers support in UI
vbaranov Apr 21, 2021
6f506b4
ERC-1155 finalization
vbaranov Apr 23, 2021
a3fba9d
ERC-1155 tokenID in tokens dropdown
vbaranov Apr 23, 2021
9bc4f8b
ERC-1155: token balanaces indexer update
vbaranov Apr 23, 2021
d526174
Add order by token.type
vbaranov Apr 28, 2021
ba34bac
Add test for mutiple current token balances insertion
vbaranov Apr 29, 2021
d052f00
Add multiple token balances from token transfers test
vbaranov Apr 29, 2021
f9e6a9c
1155 refactoring: get_balances_of_with_abi/2
vbaranov Apr 29, 2021
e75d3b7
Convert decimal to integer
vbaranov Apr 30, 2021
c8c66b5
Fix balances indexing error: ON CONFLICT DO UPDATE command cannot aff…
vbaranov Apr 30, 2021
f1e5c45
ERC-1155: fix indexer
vbaranov May 2, 2021
f86f9e7
Change order of balances records for updating
vbaranov May 3, 2021
4a0441b
Add sorting by token_id
vbaranov May 4, 2021
a027554
Add sorting by token_id:fix tests
vbaranov May 4, 2021
d21f95d
Blocks import: divide token balance insertion with and without token_id
vbaranov May 6, 2021
36d76bb
Set token_id together with token_contract_hash in group_by, oreder st…
vbaranov May 6, 2021
2be81f2
ERC-1155 metadata fetching
vbaranov May 6, 2021
655c58b
ERC-1155 metadata fetching: add tests
vbaranov May 7, 2021
31e92f8
Update delete_address_current_token_balances derive_address_current_t…
vbaranov Jun 1, 2021
f0b75e3
Additional token_id checks for token balances
vbaranov Jun 2, 2021
7a4eb8f
Update acquire_contract_address_tokens to mitigate deadlocks
vbaranov Jun 3, 2021
ee54656
Finalize ERC-1155 support
vbaranov Oct 13, 2021
8b54503
Add condition for ERC-721 token balance entry without tokenId
nikitosing Oct 2, 2021
165a468
Fix token balances 500 response
nikitosing Oct 7, 2021
e8803bd
Fix type var value for _tokens.html rendering in case of 1155
vbaranov Oct 14, 2021
b997b33
Handle zero division in Block Details page
nikitosing Oct 14, 2021
dcc6139
Merge pull request #4768 from blockscout/np-handle-zero-division
vbaranov Oct 15, 2021
3758375
Set tokenID null for ERC_721 in address current token balance table
vbaranov Oct 15, 2021
a5ffd22
Fix mobile view for address page
vbaranov Oct 15, 2021
71ca021
Update token type in balances tables
vbaranov Oct 15, 2021
eaadac2
Merge pull request #4761 from blockscout/vb-erc-1155-public
vbaranov Oct 15, 2021
1b115ef
Added view for unsuccessfully fetched values from read functions
nikitosing Oct 17, 2021
fc78d98
optimiation_runs: int4 -> int8
nikitosing Oct 17, 2021
b6dd15f
Merge pull request #4778 from blockscout/np-increase-runs-size
vbaranov Oct 18, 2021
9f48323
Add cleaning of substrings of `require` messages from parsed construc…
nikitosing Oct 13, 2021
99d58ac
Merge pull request #4764 from blockscout/np-fix-constructor-args-bug
vbaranov Oct 18, 2021
2bd8c5f
Merge pull request #4776 from blockscout/np-add-reverted-msgs-view
vbaranov Oct 18, 2021
ee6776e
Update ex_abi to 0.5.7; add decoding revert reason for contract inter…
nikitosing Oct 17, 2021
aef71cb
Merge pull request #4777 from blockscout/np-add-decoding-errors
vbaranov Oct 18, 2021
dee0af3
Empty blocks sanitizer
vbaranov Oct 6, 2021
871679a
Update token_balances_test.exs
vbaranov Oct 18, 2021
fd0014f
Add partially_verified
vbaranov Oct 18, 2021
bf7d605
Merge pull request #4724 from blockscout/vb-empty-blocks-sanitizer
vbaranov Oct 18, 2021
bec8c27
Get CRC total balance in non-blocking address page maneer
vbaranov Oct 20, 2021
59c5be0
Merge pull request #4793 from blockscout/vb-crc-total-balance-async
vbaranov Oct 21, 2021
393bc13
Fix nil.timestamp issue
vbaranov Oct 21, 2021
e633c4d
Merge pull request #4796 from blockscout/vb-fix-nil-timestamp
vbaranov Oct 21, 2021
8d45597
Token instance View contract icon Safari fix
vbaranov Oct 21, 2021
c8b3d28
Merge pull request #4798 from blockscout/vb-token-instance-view-contr…
vbaranov Oct 21, 2021
8506b0e
Show nil block.size as N/A bytes
nikitosing Oct 25, 2021
8cc6e3e
Merge pull request #4810 from blockscout/np-fix-cldr-error
vbaranov Oct 25, 2021
464ad7d
Check if exists custom_cap property of extended token object before a…
vbaranov Oct 25, 2021
e30b8c8
Merge pull request #4812 from blockscout/vb-check-custom-cap
vbaranov Oct 25, 2021
d66304f
Added clauses and tests for get_total_staked_and_ordered/1
nikitosing Oct 22, 2021
88ec3e3
Merge pull request #4801 from blockscout/np-fix-stake-dapp-bug
vbaranov Oct 25, 2021
3361e04
Finalize: check if exists custom_cap property of extended token objec…
vbaranov Oct 25, 2021
a3bcd85
Merge pull request #4815 from blockscout/vb-check-custom-cap-2
vbaranov Oct 25, 2021
01b0b03
Fix for extract_omni_bridged_token_metadata_wrapper method
vbaranov Oct 26, 2021
ef2e564
Merge pull request #4818 from blockscout/vb-extract_omni_bridged_toke…
vbaranov Oct 26, 2021
8a62223
Add config for GasUsage Cache
vbaranov Oct 26, 2021
50e4597
Merge pull request #4819 from blockscout/vb-gas-usage-cache-add-config
vbaranov Oct 26, 2021
cd960aa
Pin address overview rows
vbaranov Oct 26, 2021
9c76bc7
Block Details page: Remove crossing at the Burnt Fee line
nikitosing Oct 26, 2021
1d400cf
Merge pull request #4820 from blockscout/vb-fixate-address-fields
vbaranov Oct 26, 2021
81e18a5
Merge pull request #4821 from blockscout/np-remove-block-crossing-line
vbaranov Oct 26, 2021
be8f5a4
Various extended error handlers
vbaranov Oct 26, 2021
d7b844a
Merge pull request #4823 from blockscout/vb-extended-error-handlers
vbaranov Oct 26, 2021
dae0ed5
Add utf-8 decoding for revert reason data
nikitosing Oct 20, 2021
1ba0fb0
Add loading spinner for async data (transactions count, transfers cou…
vbaranov Oct 27, 2021
d6b7620
Logging for txs/day chart
vbaranov Oct 27, 2021
aa68d62
Merge pull request #4828 from blockscout/vb-logs-for-tx-chart
vbaranov Oct 27, 2021
d65657a
Merge pull request #4827 from blockscout/vb-address-spinner
vbaranov Oct 27, 2021
9065a09
Fix view for broken token icons
nikitosing Oct 29, 2021
2264db3
Fix floating tooltip on the main page
nikitosing Oct 22, 2021
a2bcafe
Update package.json
nikitosing Oct 25, 2021
eb8224f
Merge pull request #4802 from blockscout/np-fix-floating-tooltip
vbaranov Oct 29, 2021
ba354df
Merge pull request #4791 from blockscout/np-add-utf-decoding-for-reve…
vbaranov Oct 29, 2021
996b444
Merge pull request #4835 from blockscout/np-fix-broken-icons
vbaranov Oct 29, 2021
e8ee992
Get token type for token balance update if it is empty
vbaranov Oct 24, 2021
1a54597
Add decoding for revert messages on a read contract page
nikitosing Oct 21, 2021
c229d71
add link to the tx in case of revert in modal
nikitosing Oct 21, 2021
8dfc13e
Remove raw revert message if it was decoded
nikitosing Oct 21, 2021
e1cf872
PGAnalyze index suggestions
vbaranov Oct 18, 2021
f50f4ad
Merge pull request #4799 from blockscout/np-add-errors-decoding-to-th…
vbaranov Oct 29, 2021
d603e64
Merge pull request #4806 from blockscout/vb-get-token-type-for-token-…
vbaranov Oct 29, 2021
b61d304
Speed up txs per day chart data collection
vbaranov Oct 27, 2021
ec3fdcd
Merge pull request #4830 from blockscout/vb-speedup-tx-per-day-chart-…
vbaranov Nov 1, 2021
e225139
Dedup to Uniq
vbaranov Nov 1, 2021
ce866f8
Merge pull request #4840 from blockscout/vb-dedup-to-uniq
vbaranov Nov 1, 2021
5041f34
Empty blocks sanitizer refactoring
vbaranov Nov 1, 2021
f94f79a
Merge pull request #4842 from blockscout/vb-empty-blocks-sanitizer-re…
vbaranov Nov 1, 2021
6b131a8
Fix read contract page
nikitosing Nov 2, 2021
c251d76
Merge pull request #4847 from blockscout/np-fix-reqd-contract-page
vbaranov Nov 3, 2021
7365cf7
Added support for BeaconProxy Pattern
nikitosing Oct 24, 2021
6e550d7
Merge pull request #4807 from blockscout/np-add-support-for-beacon-pr…
vbaranov Nov 3, 2021
3cb935e
Allow custom optimizations runs for contract verifications via API
vbaranov Nov 3, 2021
ba9610e
Merge pull request #4853 from blockscout/vb-contract-verification-api…
vbaranov Nov 3, 2021
7a42c1a
Fix infinite gas usage count loading
vbaranov Nov 3, 2021
bdecc40
Merge pull request #4854 from blockscout/vb-infinite-gas-usage-count-…
vbaranov Nov 3, 2021
ae4db8e
Add default value for block_index
nikitosing Nov 3, 2021
b841d9a
Update PULL_REQUEST_TEMPLATE.md
vbaranov Nov 3, 2021
bcf2422
Node 16 support
vbaranov Nov 4, 2021
35ea38b
Merge pull request #4860 from blockscout/vb-node-16-support
vbaranov Nov 4, 2021
f05d049
Remove cumulative gas used update duplicate
vbaranov Nov 7, 2021
25a23fd
Add CHANGELOG entry
vbaranov Nov 7, 2021
c38263a
Merge pull request #4871 from blockscout/vb-block-import-update-query…
vbaranov Nov 7, 2021
1283bbb
Set explicit ascending order by hash in acquire transactions query of…
vbaranov Nov 7, 2021
8b1cb6d
Merge pull request #4872 from blockscout/vb-acquire_transactions-expl…
vbaranov Nov 8, 2021
f7e4631
Merge pull request #4857 from blockscout/np-fix-raw-trace-500
vbaranov Nov 8, 2021
4284c9b
Add missing columns updates in different update queries
vbaranov Nov 8, 2021
db3b113
Merge pull request #4876 from blockscout/vb-add-missing-columns-in-up…
vbaranov Nov 8, 2021
47e519d
Merge pull request #4781 from blockscout/vb-pganalyze-index-suggestions
vbaranov Nov 8, 2021
bdd8ea1
Delete 20211018074058_add_internal_transactions_block_number_from_add…
vbaranov Nov 9, 2021
e617c8d
Update CHANGELOG.md
vbaranov Nov 9, 2021
3b460b3
Fix fetch_top_tokens add nulls last for token holders
vbaranov Nov 10, 2021
ed034c5
Fix format_according_to_decimals method
vbaranov Nov 17, 2021
9073d47
Merge pull request #4888 from blockscout/vb-fix-top-tokens-query
vbaranov Nov 17, 2021
b15d6d0
Change button link to the verification type selection page
nikitosing Nov 22, 2021
3e40145
Merge pull request #4945 from blockscout/np-fix-verify-paths
vbaranov Nov 23, 2021
7b30b72
Web3 modal with Wallet Connect for Write contract page
vbaranov Nov 18, 2021
652c536
Web3modal refactoring
vbaranov Nov 24, 2021
9378043
Web3modal: minor fixes
vbaranov Nov 24, 2021
ec85c23
Web3Modal refactoring
vbaranov Nov 25, 2021
f409c82
Web3Modal: getNetId function refactoring
vbaranov Nov 29, 2021
b5bae30
Merge pull request #4931 from blockscout/vb-web3modal
vbaranov Nov 30, 2021
9829c8e
Merge upstream changes
Nov 30, 2021
1eef43b
Fix merge from upstream
Dec 2, 2021
135e597
Fix some of the comments
Dec 3, 2021
583bdad
Comment CRC balance
Dec 3, 2021
35bb2d4
Solve translation keys
Dec 3, 2021
fda6059
Merge branch 'master' into eruizgar91/w48-upstream-merge
Dec 3, 2021
f5a11dc
Remove duplicates
Dec 3, 2021
84bc91a
Make build work
Dec 6, 2021
190ae69
Merge branch 'master' into eruizgar91/w48-upstream-merge
Dec 6, 2021
bd6a537
Merge branch 'master' into eruizgar91/w48-upstream-merge
Dec 10, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .dialyzer-ignore
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ lib/explorer/exchange_rates/source.ex:110
lib/explorer/exchange_rates/source.ex:113
lib/explorer/smart_contract/solidity/verifier.ex:89
lib/block_scout_web/templates/address_contract/index.html.eex:156
lib/block_scout_web/templates/address_contract/index.html.eex:199
lib/block_scout_web/templates/address_contract/index.html.eex:193
lib/explorer/staking/stake_snapshotting.ex:15: Function do_snapshotting/7 has no local return
lib/explorer/staking/stake_snapshotting.ex:147
lib/explorer/third_party_integrations/sourcify.ex:70
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@

### Fixes
- [#4888](https://github.com/blockscout/blockscout/pull/4888) - Fix fetch_top_tokens method: add nulls last for token holders desc order
- [#4945](https://github.com/blockscout/blockscout/pull/4945) - Fix `Verify & Publish` button link

### Chore

Original file line number Diff line number Diff line change
@@ -159,13 +159,7 @@
</div>
<% else %>
<%= if !fully_verified do %>
<% path =
if Application.get_env(:explorer, Explorer.ThirdPartyIntegrations.Sourcify)[:enabled] do
address_verify_contract_path(@conn, :new, @address.hash)
else
address_verify_contract_via_flattened_code_path(@conn, :new, @address.hash)
end
%>
<% path = address_verify_contract_path(@conn, :new, @address.hash) %>
<%= link(
gettext("Verify & Publish"),
to: path,
@@ -202,13 +196,7 @@
</div>
<% else %>
<%= if !fully_verified and !creation_code(@address) do %>
<% path =
if Application.get_env(:explorer, Explorer.ThirdPartyIntegrations.Sourcify)[:enabled] do
address_verify_contract_path(@conn, :new, @address.hash)
else
address_verify_contract_via_flattened_code_path(@conn, :new, @address.hash)
end
%>
<% path = address_verify_contract_path(@conn, :new, @address.hash) %>
<%= link(
gettext("Verify & Publish"),
to: path,
14 changes: 7 additions & 7 deletions apps/block_scout_web/priv/gettext/default.pot
Original file line number Diff line number Diff line change
@@ -738,8 +738,8 @@ msgid "Copy Decompiled Contract Code"
msgstr ""

#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:187
#: lib/block_scout_web/templates/address_contract/index.html.eex:197
#: lib/block_scout_web/templates/address_contract/index.html.eex:181
#: lib/block_scout_web/templates/address_contract/index.html.eex:191
msgid "Copy Deployed ByteCode"
msgstr ""

@@ -944,8 +944,8 @@ msgid "Delegators’ Staked Amount"
msgstr ""

#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:185
#: lib/block_scout_web/templates/address_contract/index.html.eex:193
#: lib/block_scout_web/templates/address_contract/index.html.eex:179
#: lib/block_scout_web/templates/address_contract/index.html.eex:187
msgid "Deployed ByteCode"
msgstr ""

@@ -1130,7 +1130,7 @@ msgid "Export Data"
msgstr ""

#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:234
#: lib/block_scout_web/templates/address_contract/index.html.eex:222
msgid "External libraries"
msgstr ""

@@ -2900,8 +2900,8 @@ msgstr ""

#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:24
#: lib/block_scout_web/templates/address_contract/index.html.eex:158 lib/block_scout_web/templates/address_contract/index.html.eex:170
#: lib/block_scout_web/templates/address_contract/index.html.eex:201 lib/block_scout_web/templates/address_contract/index.html.eex:213
#: lib/block_scout_web/templates/address_contract/index.html.eex:158 lib/block_scout_web/templates/address_contract/index.html.eex:164
#: lib/block_scout_web/templates/address_contract/index.html.eex:195 lib/block_scout_web/templates/address_contract/index.html.eex:201
#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:13
msgid "Verify & Publish"
msgstr ""
14 changes: 7 additions & 7 deletions apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
Original file line number Diff line number Diff line change
@@ -738,8 +738,8 @@ msgid "Copy Decompiled Contract Code"
msgstr ""

#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:187
#: lib/block_scout_web/templates/address_contract/index.html.eex:197
#: lib/block_scout_web/templates/address_contract/index.html.eex:181
#: lib/block_scout_web/templates/address_contract/index.html.eex:191
msgid "Copy Deployed ByteCode"
msgstr ""

@@ -944,8 +944,8 @@ msgid "Delegators’ Staked Amount"
msgstr ""

#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:185
#: lib/block_scout_web/templates/address_contract/index.html.eex:193
#: lib/block_scout_web/templates/address_contract/index.html.eex:179
#: lib/block_scout_web/templates/address_contract/index.html.eex:187
msgid "Deployed ByteCode"
msgstr ""

@@ -1130,7 +1130,7 @@ msgid "Export Data"
msgstr ""

#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:234
#: lib/block_scout_web/templates/address_contract/index.html.eex:222
msgid "External libraries"
msgstr ""

@@ -2900,8 +2900,8 @@ msgstr ""

#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:24
#: lib/block_scout_web/templates/address_contract/index.html.eex:158 lib/block_scout_web/templates/address_contract/index.html.eex:170
#: lib/block_scout_web/templates/address_contract/index.html.eex:201 lib/block_scout_web/templates/address_contract/index.html.eex:213
#: lib/block_scout_web/templates/address_contract/index.html.eex:158 lib/block_scout_web/templates/address_contract/index.html.eex:164
#: lib/block_scout_web/templates/address_contract/index.html.eex:195 lib/block_scout_web/templates/address_contract/index.html.eex:201
#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:13
msgid "Verify & Publish"
msgstr ""