Skip to content

Commit 6e89f09

Browse files
Merge upstream v10.0.0 (auto-resolved version conflicts)
2 parents 8752759 + 72aaaf5 commit 6e89f09

13 files changed

Lines changed: 141 additions & 24 deletions

File tree

CHANGELOG.md

Lines changed: 117 additions & 0 deletions
Large diffs are not rendered by default.

apps/block_scout_web/lib/block_scout_web/csv_export/address/internal_transactions.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ defmodule BlockScoutWeb.CsvExport.Address.InternalTransactions do
7878
internal_transaction.index,
7979
internal_transaction.block_number,
8080
internal_transaction.transaction_index,
81-
internal_transaction.block.timestamp,
81+
internal_transaction.block && internal_transaction.block.timestamp,
8282
Address.checksum(internal_transaction.from_address_hash),
8383
Address.checksum(internal_transaction.to_address_hash),
8484
Address.checksum(internal_transaction.created_contract_address_hash),
8585
internal_transaction.type,
8686
InternalTransaction.call_type(internal_transaction),
8787
internal_transaction.gas || "0",
8888
internal_transaction.gas_used,
89-
Wei.to(internal_transaction.value, :wei),
89+
Wei.to(internal_transaction.value || Wei.zero(), :wei),
9090
internal_transaction.input,
9191
internal_transaction.output,
9292
internal_transaction.error,

apps/block_scout_web/lib/block_scout_web/models/transaction_state_helper.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ defmodule BlockScoutWeb.Models.TransactionStateHelper do
128128
do: acc
129129

130130
defp internal_transaction_to_coin_balances(internal_transaction, previous_block_number, options, acc) do
131-
if internal_transaction.value |> Wei.to(:wei) |> Decimal.positive?() do
131+
if not is_nil(internal_transaction.value) and Decimal.positive?(Wei.to(internal_transaction.value, :wei)) do
132132
acc
133133
|> Map.put_new_lazy(internal_transaction.from_address_hash, fn ->
134134
{internal_transaction.from_address,

apps/block_scout_web/lib/block_scout_web/notifier.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,15 +574,15 @@ defmodule BlockScoutWeb.Notifier do
574574
defp broadcast_address_coin_balance(%{address_hash: address_hash, block_number: block_number}) do
575575
coin_balance = CoinBalance.get_coin_balance(address_hash, block_number, @api_true)
576576

577-
if coin_balance.delta && !Decimal.eq?(coin_balance.delta, Decimal.new(0)) do
577+
if coin_balance && coin_balance.delta && !Decimal.eq?(coin_balance.delta, Decimal.new(0)) do
578578
# TODO: delete duplicated event when old UI becomes deprecated
579579
Endpoint.broadcast("addresses_old:#{address_hash}", "coin_balance", %{
580580
block_number: block_number,
581581
coin_balance: coin_balance
582582
})
583583
end
584584

585-
if coin_balance.value && coin_balance.delta && !Decimal.eq?(coin_balance.delta, Decimal.new(0)) do
585+
if coin_balance && coin_balance.value && coin_balance.delta && !Decimal.eq?(coin_balance.delta, Decimal.new(0)) do
586586
rendered_coin_balance = AddressView.render("coin_balance.json", %{coin_balance: coin_balance})
587587

588588
Endpoint.broadcast("addresses:#{address_hash}", "coin_balance", %{

apps/block_scout_web/lib/block_scout_web/views/api/v2/internal_transaction_view.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ defmodule BlockScoutWeb.API.V2.InternalTransactionView do
22
use BlockScoutWeb, :view
33

44
alias BlockScoutWeb.API.V2.Helper
5-
alias Explorer.Chain.{Block, InternalTransaction}
5+
alias Explorer.Chain.{Block, InternalTransaction, Wei}
66

77
def render("internal_transaction.json", %{internal_transaction: nil}) do
88
nil
@@ -47,7 +47,7 @@ defmodule BlockScoutWeb.API.V2.InternalTransactionView do
4747
internal_transaction.created_contract_address_hash,
4848
false
4949
),
50-
"value" => internal_transaction.value,
50+
"value" => internal_transaction.value || Wei.zero(),
5151
"block_number" => internal_transaction.block_number,
5252
"timestamp" => (block && block.timestamp) || (internal_transaction.block && internal_transaction.block.timestamp),
5353
"index" => internal_transaction.index,

apps/block_scout_web/test/block_scout_web/features/viewing_addresses_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ defmodule BlockScoutWeb.ViewingAddressesTest do
223223
to_address: address,
224224
transaction_index: transaction.index,
225225
index: 1,
226-
block_number: 7000,
226+
block_number: transaction.block_number,
227227
block_hash: transaction.block_hash
228228
)
229229

@@ -232,7 +232,7 @@ defmodule BlockScoutWeb.ViewingAddressesTest do
232232
from_address: address,
233233
transaction_index: transaction.index,
234234
index: 2,
235-
block_number: 8000,
235+
block_number: transaction.block_number,
236236
block_hash: transaction.block_hash
237237
)
238238

apps/explorer/config/config.exs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ for index_operation <- [
181181
Explorer.Migrator.HeavyDbIndexOperation.DropTokenInstancesTokenIdIndex,
182182
Explorer.Migrator.HeavyDbIndexOperation.CreateTokensNamePartialFtsIndex,
183183
Explorer.Migrator.HeavyDbIndexOperation.UpdateInternalTransactionsPrimaryKey,
184-
Explorer.Migrator.HeavyDbIndexOperation.DropInternalTransactionsBlockHashTransactionIndexIndexIndex
184+
Explorer.Migrator.HeavyDbIndexOperation.DropInternalTransactionsBlockHashTransactionIndexIndexIndex,
185+
Explorer.Migrator.HeavyDbIndexOperation.DropInternalTransactionsCreatedContractAddressHashPartialIndex
185186
] do
186187
config :explorer, index_operation, enabled: true
187188
end

apps/explorer/config/runtime/test.exs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ for migrator <- [
111111
Explorer.Migrator.HeavyDbIndexOperation.DropTokenInstancesTokenIdIndex,
112112
Explorer.Migrator.HeavyDbIndexOperation.CreateTokensNamePartialFtsIndex,
113113
Explorer.Migrator.HeavyDbIndexOperation.UpdateInternalTransactionsPrimaryKey,
114-
Explorer.Migrator.HeavyDbIndexOperation.DropInternalTransactionsBlockHashTransactionIndexIndexIndex
114+
Explorer.Migrator.HeavyDbIndexOperation.DropInternalTransactionsBlockHashTransactionIndexIndexIndex,
115+
Explorer.Migrator.HeavyDbIndexOperation.DropInternalTransactionsCreatedContractAddressHashPartialIndex
115116
] do
116117
config :explorer, migrator, enabled: false
117118
end

apps/explorer/lib/explorer/chain/advanced_filter.ex

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,6 @@ defmodule Explorer.Chain.AdvancedFilter do
251251
end
252252

253253
defp to_advanced_filter(%InternalTransaction{} = internal_transaction) do
254-
%{value: decimal_internal_transaction_value} = internal_transaction.value
255-
256254
%__MODULE__{
257255
hash: internal_transaction.transaction.hash,
258256
created_from: :internal_transaction,
@@ -262,7 +260,7 @@ defmodule Explorer.Chain.AdvancedFilter do
262260
from_address_hash: internal_transaction.from_address_hash,
263261
to_address_hash: internal_transaction.to_address_hash,
264262
created_contract_address_hash: internal_transaction.created_contract_address_hash,
265-
value: decimal_internal_transaction_value,
263+
value: (internal_transaction.value && internal_transaction.value.value) || Decimal.new(0),
266264
fee:
267265
internal_transaction.transaction.gas_price && internal_transaction.gas_used &&
268266
Decimal.mult(internal_transaction.transaction.gas_price.value, internal_transaction.gas_used),

apps/explorer/lib/explorer/chain/cache/background_migrations.ex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ defmodule Explorer.Chain.Cache.BackgroundMigrations do
5858
key: :heavy_indexes_create_addresses_transactions_count_desc_partial_index_finished,
5959
key: :heavy_indexes_create_addresses_transactions_count_asc_coin_balance_desc_hash_partial_index_finished,
6060
key: :heavy_indexes_drop_token_instances_token_id_index_finished,
61-
key: :fill_internal_transaction_to_address_hash_with_created_contract_address_hash_finished,
6261
key: :heavy_indexes_drop_internal_transactions_created_contract_address_hash_partial_index_finished,
6362
key: :heavy_indexes_create_tokens_name_partial_fts_index_finished,
6463
key: :heavy_indexes_update_internal_transactions_primary_key_finished,

0 commit comments

Comments
 (0)