W48 upstream merge #487
Closed
W48 upstream merge #487
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Change keys of cache for update GA
…ion-names Fix empty contract's function names
Ability to hide miner in block views
Block Details page: Improved style of transactions button
Add `token_tile_view_more.css` to the `main-page.css`
…ged-with-mainnet Display token icon for tokens from TrustWallet assets repository
…lector Hide error selector in the contract's functions list
…r-txs-btn Change alpha of transactions button's background
…-alert Support HTML tags in alert message
…ion-link Contract address page: Add implementation link to the overview of proxy contracts
…obile-view-fix Token page: fixes in mobile view
…or-tx Refine view of popup for reverted tx
Transaction page: Rename burned to burnt
`if !` change to `unless`
…query Fix fetch_top_tokens method: add nulls last for token holders desc order
Change button link to the verification type selection page
Web3 modal with Wallet Connect for Write contract page and Staking Dapp
eruizgar91
force-pushed
the
eruizgar91/w48-upstream-merge
branch
from
edb2d30 to
1eef43b
Compare
carterqw2
suggested changes
Dec 2, 2021
There was a problem hiding this comment.
There is a regression in how revert reasons are handled, they changed the way they decode them and since we're using geth, it is different from what the upstream team is using, so we need to carefully update that code.
Looks like now users can connect their wallet using wallet connect, let's make sure that people can do that with Valora as well.
| @@ -11,7 +11,7 @@ defmodule BlockScoutWeb.CSPHeader do | |||
| def call(conn, _opts) do | |||
| Controller.put_secure_browser_headers(conn, %{ | |||
| "content-security-policy" => "\ | |||
| connect-src 'self' #{websocket_endpoints(conn)} https://request-global.czilladx.com/ https://raw.githubusercontent.com/trustwallet/assets/;\ | |||
| connect-src 'self' #{websocket_endpoints(conn)} wss://*.bridge.walletconnect.org/ https://request-global.czilladx.com/ https://raw.githubusercontent.com/trustwallet/assets/ https://registry.walletconnect.org/data/wallets.json https://*.poa.network;\ | |||
There was a problem hiding this comment.
I think we can remove https://*.poa.network.
| @@ -61,4 +61,13 @@ | |||
| data_test: "address-tokens-panel-tokens-worth", | |||
| classes: ["fs-14"] | |||
| %> | |||
| <%= render BlockScoutWeb.AddressTokenView, "overview_item.html", | |||
There was a problem hiding this comment.
What's CRC? We should disable everything related to Circle/CRC.
| @@ -3298,16 +3341,3 @@ msgstr "" | |||
| #: lib/block_scout_web/templates/stakes/_stakes_modal_delegators_list.html.eex:18 | |||
| msgid "validator" | |||
| msgstr "" | |||
|
|
|||
| # From templates/transaction/_token_transfer.html.eex | |||
There was a problem hiding this comment.
Lost translations, we still need those.
| @@ -3299,16 +3342,3 @@ msgstr "" | |||
| #: lib/block_scout_web/templates/stakes/_stakes_modal_delegators_list.html.eex:18 | |||
| msgid "validator" | |||
| msgstr "" | |||
|
|
|||
| # From templates/transaction/_token_transfer.html.eex | |||
| @@ -47,9 +47,11 @@ defmodule Explorer.Chain.TokenTransfer do | |||
| * `:transaction` - The `t:Explorer.Chain.Transaction.t/0` ledger | |||
| * `:transaction_hash` - Transaction foreign key | |||
| * `:log_index` - Index of the corresponding `t:Explorer.Chain.Log.t/0` in the transaction. | |||
| * `:amounts` - Tokens transferred amounts in case of batched transfer in ERC-1155 | |||
| * `:token_ids` - IDs of the tokens (applicable to ERC-1155 tokens) | |||
docker/Dockerfile
Outdated
| @@ -5,6 +5,17 @@ RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tool | |||
| ENV GLIBC_REPO=https://github.com/sgerrand/alpine-pkg-glibc | |||
| ENV GLIBC_VERSION=2.30-r0 | |||
|
|
|||
| RUN set -ex && \ | |||
There was a problem hiding this comment.
Weird duplicate (see 2 lines above and 1 below), should be removed.
docker/Dockerfile
Outdated
| @@ -44,6 +55,8 @@ ADD apps/explorer/package*.json ./apps/explorer/ | |||
|
|
|||
| RUN npm install npm@latest | |||
|
|
|||
| RUN npm install npm@latest | |||
| # | ||
| # Tokens.acquire_contract_address_tokens(repo, contract_address_hashes) | ||
| # end | ||
| defp acquire_contract_address_tokens(repo, consensus_block_numbers) do |
There was a problem hiding this comment.
I think this was commented out because on Celo blocks there are no blocks without consensus. Other methods in this file need to be checked agains both our and upstream versions.
eruizgar91
force-pushed
the
eruizgar91/w48-upstream-merge
branch
from
1b65355 to
135e597
Compare
eruizgar91
force-pushed
the
eruizgar91/w48-upstream-merge
branch
from
c671c14 to
84bc91a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
W48 upstream changes:
Verify & Publishbutton linkPositionpane for txs have no block