Fix merge from upstream

celo-org · Dec 2, 2021 · 1eef43b · 1eef43b
1 parent 9829c8e
commit 1eef43b
Show file tree

Hide file tree

Showing 49 changed files with 4,021 additions and 3,647 deletions.
diff --git a/.dialyzer-ignore b/.dialyzer-ignore
@@ -19,7 +19,8 @@ lib/block_scout_web/views/layout_view.ex:145: The call 'Elixir.Poison.Parser':'p
 lib/block_scout_web/views/layout_view.ex:237: The call 'Elixir.Poison.Parser':'parse!'
 lib/block_scout_web/controllers/api/rpc/transaction_controller.ex:21
 lib/block_scout_web/controllers/api/rpc/transaction_controller.ex:22
-lib/explorer/smart_contract/reader.ex:461
+lib/explorer/smart_contract/reader.ex:499
+lib/explorer/smart_contract/reader.ex:518
 lib/indexer/fetcher/token_total_supply_on_demand.ex:16
 lib/explorer/exchange_rates/source.ex:110
 lib/explorer/exchange_rates/source.ex:113

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -13,6 +13,7 @@ env:
   MIX_ENV: test
   OTP_VERSION: '24.1'
   ELIXIR_VERSION: '1.12.3'
+  NODE_VERSION: '16.13.0'
 
 jobs:
   build-and-cache:
@@ -71,9 +72,9 @@ jobs:
         id: blockscoutweb-npm-cache
         with:
           path: apps/block_scout_web/assets/node_modules
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-blockscoutweb-npm-${{ hashFiles('apps/block_scout_web/assets/package-lock.json') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ env.NODE_VERSION }}-blockscoutweb-npm-${{ hashFiles('apps/block_scout_web/assets/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-blockscoutweb-npm-
+            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ env.NODE_VERSION }}-blockscoutweb-npm-
 
       - name: Conditionally build Blockscout Web NPM Cache
         if: steps.blockscoutweb-npm-cache.outputs.cache-hit != 'true'
@@ -257,9 +258,9 @@ jobs:
         id: blockscoutweb-npm-cache
         with:
           path: apps/block_scout_web/assets/node_modules
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-blockscoutweb-npm-${{ hashFiles('apps/block_scout_web/assets/package-lock.json') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ env.NODE_VERSION }}-blockscoutweb-npm-${{ hashFiles('apps/block_scout_web/assets/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-blockscoutweb-npm-
+            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ env.NODE_VERSION }}-blockscoutweb-npm-
 
       - run: npm rebuild node-sass
         working-directory: apps/block_scout_web/assets
@@ -297,9 +298,9 @@ jobs:
         id: blockscoutweb-npm-cache
         with:
           path: apps/block_scout_web/assets/node_modules
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-blockscoutweb-npm-${{ hashFiles('apps/block_scout_web/assets/package-lock.json') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ env.NODE_VERSION }}-blockscoutweb-npm-${{ hashFiles('apps/block_scout_web/assets/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-blockscoutweb-npm-
+            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ env.NODE_VERSION }}-blockscoutweb-npm-
 
       - run: npm rebuild node-sass
         working-directory: apps/block_scout_web/assets
@@ -574,9 +575,9 @@ jobs:
         id: blockscoutweb-npm-cache
         with:
           path: apps/block_scout_web/assets/node_modules
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-blockscoutweb-npm-${{ hashFiles('apps/block_scout_web/assets/package-lock.json') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ env.NODE_VERSION }}-blockscoutweb-npm-${{ hashFiles('apps/block_scout_web/assets/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-blockscoutweb-npm-
+            ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-${{ env.NODE_VERSION }}-blockscoutweb-npm-
 
       - run: npm rebuild node-sass
         working-directory: apps/block_scout_web/assets

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json
@@ -23,12 +23,12 @@
     "analytics": "^0.7.18",
     "@fortawesome/fontawesome-free": "^5.15.4",
     "@tarekraafat/autocomplete.js": "^10.2.6",
+    "@walletconnect/web3-provider": "^1.6.6",
     "assert": "^2.0.0",
     "awesomplete": "^1.1.5",
     "bignumber.js": "^9.0.1",
     "bootstrap": "^4.6.0",
     "chart.js": "^3.6.0",
-    "@walletconnect/web3-provider": "^1.6.6",
     "chartjs-adapter-moment": "^1.0.0",
     "clipboard": "^2.0.8",
     "core-js": "^2.6.12",
@@ -61,6 +61,7 @@
     "url": "^0.11.0",
     "util": "^0.12.4",
     "web3": "^1.6.0",
+    "web3modal": "^1.9.4",
     "xss": "^1.0.10"
   },
   "devDependencies": {
@@ -81,7 +82,7 @@
     "file-loader": "^6.2.0",
     "jest": "^25.1.0",
     "mini-css-extract-plugin": "^1.6.2",
-    "node-sass": "^6.0.1",
+    "node-sass": "^6.0.0",
     "postcss": "^8.3.5",
     "postcss-loader": "^4.3.0",
     "sass-loader": "^12.3.0",

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
@@ -53,18 +53,6 @@
             <dt class="col-md-2 text-muted"><%= gettext "Optimization enabled" %></dt>
             <dd class="col-md-4"><%= if target_contract.is_vyper_contract, do: "N/A", else: format_optimization_text(target_contract.optimization) %></dd>
           </dl>
-          <%= if @is_proxy do %>
-            <dl class="row">
-            <dt class="col-md-2 text-muted"><%= gettext "Is a Proxy?" %></dt>
-            <dd class="col-md-4"><%= @is_proxy %></dd>
-            <div class="d-none d-sm-block d-md-none"></br></br></div>
-            <div class="d-block d-sm-none"></br></br></div>
-            <%= if @implementation.smart_contract &&  @implementation.smart_contract.name do %>
-              <dt class="col-md-2 text-muted"><%= gettext "Implementation Name:" %></dt>
-              <dd class="col-md-4"><%= @implementation.smart_contract.name %></dd>
-            <% end %>
-            </dl>
-          <% end %>
           <dl class="row">
             <dt class="col-md-2 text-muted"><%= gettext "Compiler version" %></dt>
             <dd class="col-md-4"><%= target_contract.compiler_version %></dd>

diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
@@ -636,7 +636,7 @@ msgid "Compiler"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:69
+#: lib/block_scout_web/templates/address_contract/index.html.eex:57
 msgid "Compiler version"
 msgstr ""
 
@@ -686,7 +686,7 @@ msgid "Connection Lost, click to load newer validations"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:94
+#: lib/block_scout_web/templates/address_contract/index.html.eex:82
 msgid "Constructor Arguments"
 msgstr ""
 
@@ -696,7 +696,7 @@ msgid "Contract"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:132
+#: lib/block_scout_web/templates/address_contract/index.html.eex:120
 msgid "Contract ABI"
 msgstr ""
 
@@ -725,8 +725,8 @@ msgid "Contract Creation"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:148
-#: lib/block_scout_web/templates/address_contract/index.html.eex:163
+#: lib/block_scout_web/templates/address_contract/index.html.eex:136
+#: lib/block_scout_web/templates/address_contract/index.html.eex:151
 msgid "Contract Creation Code"
 msgstr ""
 
@@ -754,12 +754,12 @@ msgid "Contract name:"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:104
+#: lib/block_scout_web/templates/address_contract/index.html.eex:92
 msgid "Contract source code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:154
+#: lib/block_scout_web/templates/address_contract/index.html.eex:142
 msgid "Contracts that self destruct in their constructors have no contract code published and cannot be verified."
 msgstr ""
 
@@ -769,7 +769,7 @@ msgid "Contribute"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:134
+#: lib/block_scout_web/templates/address_contract/index.html.eex:122
 msgid "Copy ABI"
 msgstr ""
 
@@ -782,8 +782,8 @@ msgid "Copy Address"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:150
-#: lib/block_scout_web/templates/address_contract/index.html.eex:166
+#: lib/block_scout_web/templates/address_contract/index.html.eex:138
+#: lib/block_scout_web/templates/address_contract/index.html.eex:154
 msgid "Copy Contract Creation Code"
 msgstr ""
 
@@ -793,8 +793,8 @@ msgid "Copy Decompiled Contract Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:193
-#: lib/block_scout_web/templates/address_contract/index.html.eex:203
+#: 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 ""
 
@@ -828,8 +828,8 @@ msgid "Copy Raw Trace"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:106
-#: lib/block_scout_web/templates/address_contract/index.html.eex:120
+#: lib/block_scout_web/templates/address_contract/index.html.eex:94
+#: lib/block_scout_web/templates/address_contract/index.html.eex:108
 msgid "Copy Source Code"
 msgstr ""
 
@@ -1004,8 +1004,8 @@ msgid "Delegators’ Staked Amount"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:191
-#: lib/block_scout_web/templates/address_contract/index.html.eex:199
+#: 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 ""
 
@@ -1028,7 +1028,7 @@ msgid "Difficulty"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:155
+#: lib/block_scout_web/templates/address_contract/index.html.eex:143
 msgid "Displaying the init data provided of the creating transaction."
 msgstr ""
 
@@ -1084,7 +1084,7 @@ msgid "ETH RPC API Documentation"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:80
+#: lib/block_scout_web/templates/address_contract/index.html.eex:68
 #: lib/block_scout_web/templates/address_contract_verification_via_flattened_code/new.html.eex:82
 msgid "EVM Version"
 msgstr ""
@@ -1189,7 +1189,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 ""
 
@@ -1363,11 +1363,6 @@ msgstr ""
 msgid "Implementation"
 msgstr ""
 
-#, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:63
-msgid "Implementation Name:"
-msgstr ""
-
 #, elixir-format
 #: lib/block_scout_web/templates/address/overview.html.eex:148
 msgid "Implementation address of the proxy contract."
@@ -1432,11 +1427,6 @@ msgstr ""
 msgid "Inventory"
 msgstr ""
 
-#, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:58
-msgid "Is a Proxy?"
-msgstr ""
-
 #, elixir-format
 #: lib/block_scout_web/templates/transaction/not_found.html.eex:16
 msgid "It could still be in the TX Pool of a different node, waiting to be broadcasted."
@@ -1789,7 +1779,7 @@ msgid "Optimization enabled"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:74
+#: lib/block_scout_web/templates/address_contract/index.html.eex:62
 #: lib/block_scout_web/templates/address_contract_verification_via_flattened_code/new.html.eex:114
 msgid "Optimization runs"
 msgstr ""
@@ -3007,14 +2997,14 @@ msgid "Value sent in CELO (and USD) if applicable."
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:86
+#: lib/block_scout_web/templates/address_contract/index.html.eex:74
 msgid "Verified at"
 msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/address_contract/index.html.eex:24
-#: lib/block_scout_web/templates/address_contract/index.html.eex:170 lib/block_scout_web/templates/address_contract/index.html.eex:176
-#: lib/block_scout_web/templates/address_contract/index.html.eex:207 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 ""
@@ -3351,11 +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
-msgid "cGLD"
-msgstr "CELO"
-
-# From templates/tokens/overview/details.html.eex#
-msgid "Celo Gold"
-msgstr "CELO"