Skip to content
This repository has been archived by the owner on Jun 12, 2023. It is now read-only.

Use the correct chain var for bloom filter reset #1594

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use the correct chain var for bloom filter reset #1594

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 33 additions & 33 deletions src/poc/miner_poc_mgr.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
-record(addr_hash_filter, {
start :: pos_integer(),
height :: pos_integer(),
interval :: pos_integer(),
byte_size :: pos_integer(),
salt :: binary(),
bloom :: bloom_nif:bloom()
Expand Down Expand Up @@ -829,22 +830,24 @@ maybe_init_addr_hash(#state{chain = Chain, addr_hash_filter = undefined} = State
Ledger = blockchain:ledger(Chain),
case blockchain:config(?poc_addr_hash_byte_count, Ledger) of
{ok, Bytes} when is_integer(Bytes), Bytes > 0 ->
case blockchain:config(?poc_challenge_interval, Ledger) of
{ok, Interval} ->
case blockchain:config(?poc_challenge_rate, Ledger) of
{ok, Rate} ->
Gateways = blockchain_ledger_v1:gateway_count(Ledger),
Interval = floor(Gateways div Rate),
{ok, Height} = blockchain:height(Chain),
StartHeight = max(Height - (Height rem Interval), 1),
%% check if we have this block
case blockchain:get_block(StartHeight, Chain) of
{ok, Block} ->
Hash = blockchain_block:hash_block(Block),
%% ok, now we can build the filter
Gateways = blockchain_ledger_v1:gateway_count(Ledger),
{ok, Bloom} = bloom:new_optimal(Gateways, ?ADDR_HASH_FP_RATE),
sync_filter(Block, Bloom, Chain),
State#state{
addr_hash_filter = #addr_hash_filter{
start = StartHeight,
height = Height,
interval = Interval,
byte_size = Bytes,
salt = Hash,
bloom = Bloom
Expand All @@ -865,6 +868,7 @@ maybe_init_addr_hash(
addr_hash_filter = #addr_hash_filter{
start = StartHeight,
height = Height,
interval = Interval,
byte_size = Bytes,
salt = Hash,
bloom = Bloom
Expand All @@ -874,38 +878,34 @@ maybe_init_addr_hash(
Ledger = blockchain:ledger(Chain),
case blockchain:config(?poc_addr_hash_byte_count, Ledger) of
{ok, Bytes} when is_integer(Bytes), Bytes > 0 ->
case blockchain:config(?poc_challenge_interval, Ledger) of
{ok, Interval} ->
{ok, CurHeight} = blockchain:height(Chain),
case max(Height - (Height rem Interval), 1) of
StartHeight ->
case CurHeight of
Height ->
%% ok, everything lines up
State;
{ok, CurHeight} = blockchain:height(Chain),
case max(Height - (Height rem Interval), 1) of
StartHeight ->
case CurHeight of
Height ->
%% ok, everything lines up
State;
_ ->
case blockchain:get_block(Height + 1, Chain) of
{ok, Block} ->
sync_filter(Block, Bloom, Chain),
State#state{
addr_hash_filter = #addr_hash_filter{
start = StartHeight,
height = CurHeight,
interval = Interval,
byte_size = Bytes,
salt = Hash,
bloom = Bloom
}
};
_ ->
case blockchain:get_block(Height + 1, Chain) of
{ok, Block} ->
sync_filter(Block, Bloom, Chain),
State#state{
addr_hash_filter = #addr_hash_filter{
start = StartHeight,
height = CurHeight,
byte_size = Bytes,
salt = Hash,
bloom = Bloom
}
};
_ ->
State
end
end;
_NewStart ->
%% filter is stale
maybe_init_addr_hash(State#state{addr_hash_filter = undefined})
State
end
end;
_ ->
State
_NewStart ->
%% filter is stale
maybe_init_addr_hash(State#state{addr_hash_filter = undefined})
end;
_ ->
State#state{addr_hash_filter = undefined}
Expand Down