Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix from discord feedback: edge case when no storage modules, fix mes… #468

Open
wants to merge 1 commit into
base: feature/coordinated-mining_v4
Choose a base branch
from
Open

fix from discord feedback: edge case when no storage modules, fix mes… #468

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/arweave/src/ar_coordination.erl
View file
Open in desktop
Expand Up @@ -95,7 +95,7 @@ init([]) ->
true ->
case Config#config.cm_exit_peer of
not_set ->
ar:console("CRITICAL WARNING. cm_exit_peer is not set. Coordinated mining will not produce final solution.~n");
ar:console("CRITICAL WARNING. cm_exit_peer is not set. Coordinated mining will not produce final solution. Ignore this message if this peer is exit peer~n");
_ ->
ok
end,
Expand Down
69 changes: 37 additions & 32 deletions apps/arweave/src/ar_http_iface_middleware.erl
View file
Open in desktop
Expand Up @@ -2980,38 +2980,43 @@ handle_get_vdf2(Req, Call) ->

handle_coordinated_mining_partition_table(Req) ->
{ok, Config} = application:get_env(arweave, config),
Partition_dict = lists:foldl(fun(Module, Dict) ->
{BucketSize, Bucket, {spora_2_6, Addr}} = Module,
MinPartitionId = Bucket*BucketSize div ?PARTITION_SIZE,
MaxPartitionId = (Bucket+1)*BucketSize div ?PARTITION_SIZE,
PartitionList = lists:seq(MinPartitionId, MaxPartitionId),
lists:foldl(fun(PartitionId, Dict2) ->
AddrDict = maps:get(PartitionId, Dict2, #{}),
AddrDict2 = maps:put(Addr, true, AddrDict),
maps:put(PartitionId, AddrDict2, Dict2)
end, Dict, PartitionList)
end, #{}, Config#config.storage_modules),
Right_bound = lists:max(lists:map(fun({BucketSize, Bucket, {spora_2_6, _Addr}}) ->
(Bucket+1)*BucketSize
end, Config#config.storage_modules)),
Right_bound_partition_id = Right_bound div ?PARTITION_SIZE,
CheckPartitionList = lists:seq(0, Right_bound_partition_id),
Table = lists:foldr(fun(PartitionId, Acc) ->
case maps:find(PartitionId, Partition_dict) of
{ok, AddrDict} ->
maps:fold(fun(Addr, _, Acc2) ->
NewEntity = {[
{bucket, PartitionId},
{bucketsize, ?PARTITION_SIZE},
{addr, ar_util:encode(Addr)}
% TODO range start, end for less requests (better check before send)
]},
[NewEntity | Acc2]
end, Acc, AddrDict);
_ ->
Acc
end
end, [], CheckPartitionList),
Table = case Config#config.storage_modules of
[] ->
[];
StorageModules ->
Partition_dict = lists:foldl(fun(Module, Dict) ->
{BucketSize, Bucket, {spora_2_6, Addr}} = Module,
MinPartitionId = Bucket*BucketSize div ?PARTITION_SIZE,
MaxPartitionId = (Bucket+1)*BucketSize div ?PARTITION_SIZE,
PartitionList = lists:seq(MinPartitionId, MaxPartitionId),
lists:foldl(fun(PartitionId, Dict2) ->
AddrDict = maps:get(PartitionId, Dict2, #{}),
AddrDict2 = maps:put(Addr, true, AddrDict),
maps:put(PartitionId, AddrDict2, Dict2)
end, Dict, PartitionList)
end, #{}, StorageModules),
Right_bound = lists:max(lists:map(fun({BucketSize, Bucket, {spora_2_6, _Addr}}) ->
(Bucket+1)*BucketSize
end, StorageModules)),
Right_bound_partition_id = Right_bound div ?PARTITION_SIZE,
CheckPartitionList = lists:seq(0, Right_bound_partition_id),
lists:foldr(fun(PartitionId, Acc) ->
case maps:find(PartitionId, Partition_dict) of
{ok, AddrDict} ->
maps:fold(fun(Addr, _, Acc2) ->
NewEntity = {[
{bucket, PartitionId},
{bucketsize, ?PARTITION_SIZE},
{addr, ar_util:encode(Addr)}
% TODO range start, end for less requests (better check before send)
]},
[NewEntity | Acc2]
end, Acc, AddrDict);
_ ->
Acc
end
end, [], CheckPartitionList)
end,
{200, #{}, ar_serialize:jsonify(Table), Req}.

read_complete_body(Req, Pid) ->
Expand Down