Solution Rebasing

apps/arweave/include/ar.hrl

@@ -27,7 +27,7 @@
 -define(CLIENT_VERSION, 5).
 
 %% The current build number -- incremented for every release.
--define(RELEASE_NUMBER, 69).
+-define(RELEASE_NUMBER, 70).
 
 -define(DEFAULT_REQUEST_HEADERS,
 	[
@@ -406,7 +406,6 @@
 -record(nonce_limiter_update, {
 	session_key,
 	session,
-	checkpoints,
 	is_partial = true
 }).
 

apps/arweave/include/ar_blacklist_middleware.hrl

@@ -39,9 +39,15 @@ end).
 		[<<"vdf">>] ->
 			{get_vdf, maps:get(get_vdf, LimitByIP, 180)};
 		[<<"vdf">>, <<"session">>] ->
-			{get_vdf, maps:get(get_vdf, LimitByIP, 180)};
+			{get_vdf_session, maps:get(get_vdf_session, LimitByIP, 120)};
+		[<<"vdf2">>, <<"session">>] ->
+			{get_vdf_session, maps:get(get_vdf_session, LimitByIP, 120)};
+		[<<"vdf3">>, <<"session">>] ->
+			{get_vdf_session, maps:get(get_vdf_session, LimitByIP, 120)};
 		[<<"vdf">>, <<"previous_session">>] ->
-			{get_vdf, maps:get(get_vdf, LimitByIP, 180)};
+			{get_previous_vdf_session, maps:get(get_previous_vdf_session, LimitByIP, 60)};
+		[<<"vdf2">>, <<"previous_session">>] ->
+			{get_previous_vdf_session, maps:get(get_previous_vdf_session, LimitByIP, 60)};
 		_ ->
 			{default, maps:get(default, LimitByIP, DefaultPathLimit)}
 	end
@@ -74,9 +80,15 @@ end).
 		[<<"vdf">>] ->
 			{get_vdf, maps:get(get_vdf, LimitByIP, 180)};
 		[<<"vdf">>, <<"session">>] ->
-			{get_vdf, maps:get(get_vdf, LimitByIP, 180)};
+			{get_vdf_session, maps:get(get_vdf_session, LimitByIP, 60)};
+		[<<"vdf2">>, <<"session">>] ->
+			{get_vdf_session, maps:get(get_vdf_session, LimitByIP, 60)};
+		[<<"vdf3">>, <<"session">>] ->
+			{get_vdf_session, maps:get(get_vdf_session, LimitByIP, 60)};
 		[<<"vdf">>, <<"previous_session">>] ->
-			{get_vdf, maps:get(get_vdf, LimitByIP, 180)};
+			{get_previous_vdf_session, maps:get(get_previous_vdf_session, LimitByIP, 60)};
+		[<<"vdf2">>, <<"previous_session">>] ->
+			{get_previous_vdf_session, maps:get(get_previous_vdf_session, LimitByIP, 60)};
 		_ ->
 			{default, maps:get(default, LimitByIP, DefaultPathLimit)}
 	end

apps/arweave/src/ar_block_cache.erl

@@ -7,7 +7,8 @@
 		mark_tip/2, get/2, get_earliest_not_validated_from_longest_chain/1,
 		get_longest_chain_cache/1,
 		get_block_and_status/2, remove/2, get_checkpoint_block/1, prune/2,
-		get_by_solution_hash/5, is_known_solution_hash/2]).
+		get_by_solution_hash/5, is_known_solution_hash/2,
+		get_siblings/2, get_fork_blocks/2]).
 
 -include_lib("arweave/include/ar.hrl").
 -include_lib("eunit/include/eunit.hrl").
@@ -21,10 +22,6 @@
 %% validated: block is validated but does not belong to the tip fork
 %% not_validated: block is not validated yet
 %% none: null status
--type validation_status() :: on_chain | validated | not_validated | none.
--type nonce_limiter_validation_status() :: nonce_limiter_validated | 
-	awaiting_nonce_limiter_validation.
--type block_status() :: validation_status() | {not_validated, nonce_limiter_validation_status()}.
 
 %% @doc ETS table: block_cache
 %% {block, BlockHash} => {#block{}, block_status(), Timestamp, set(Children)}
@@ -306,8 +303,8 @@ get_block_and_status(Tab, H) ->
 	case ets:lookup(Tab, {block, H}) of
 		[] ->
 			not_found;
-		[{_, {B, Status, _Timestamp, _Children}}] ->
-			{B, Status}
+		[{_, {B, Status, Timestamp, _Children}}] ->
+			{B, {Status, Timestamp}}
 	end.
 
 %% @doc Mark the given block as the tip block. Mark the previous blocks as on-chain.
@@ -432,6 +429,33 @@ get_by_solution_hash(Tab, SolutionH, H, CDiff, PrevCDiff, [H2 | L], _B) ->
 			get_by_solution_hash(Tab, SolutionH, H, CDiff, PrevCDiff, L, B2)
 	end.
 
+%% @doc Return the list of siblings of the given block, if any.
+get_siblings(Tab, B) ->
+	H = B#block.indep_hash,
+	PrevH = B#block.previous_block,
+	case ets:lookup(Tab, {block, PrevH}) of
+		[] ->
+			[];
+		[{_, {_B, _Status, _CurrentTimestamp, Children}}] ->
+			sets:fold(
+				fun(SibH, Acc) ->
+					case SibH of
+						H ->
+							Acc;
+						_ ->
+							case ets:lookup(Tab, {block, SibH}) of
+								[] ->
+									Acc;
+								[{_, {Sib, _, _, _}}] ->
+									[Sib | Acc]
+							end
+					end
+				end,
+				[],
+				Children
+			)
+	end.
+
 %%%===================================================================
 %%% Private functions.
 %%%===================================================================
@@ -1013,6 +1037,7 @@ block_cache_test() ->
 	assert_tip(block_id(B1)),
 	assert_max_cdiff({0, block_id(B1)}),
 	assert_is_valid_fork(true, on_chain, B1),
+	?assertEqual([], get_siblings(bcache_test, B1)),
 
 	%% Re-adding B1 shouldn't change anything - i.e. nothing should be updated because the
 	%% block is already on chain
@@ -1056,6 +1081,7 @@ block_cache_test() ->
 	assert_max_cdiff({1, block_id(B2)}),
 	assert_is_valid_fork(true, on_chain, B1),
 	assert_is_valid_fork(true, not_validated, B2),
+	?assertEqual([], get_siblings(bcache_test, B2)),
 
 	%% Add a TXID to B2, but still don't mark as validated
 	%%
@@ -1113,6 +1139,8 @@ block_cache_test() ->
 	assert_is_valid_fork(true, on_chain, B1),
 	assert_is_valid_fork(true, not_validated, B2),
 	assert_is_valid_fork(true, not_validated, B1_2),
+	?assertEqual([B2], get_siblings(bcache_test, B1_2)),
+	?assertEqual([B1_2], get_siblings(bcache_test, B2)),
 
 	%% Even though B2 is marked as a tip, it is still lower difficulty than B1_2 so will
 	%% not be included in the longest chain
@@ -1243,7 +1271,8 @@ block_cache_test() ->
 	%%					  \             /
 	%% 0					B1/on_chain
 	add_validated(bcache_test, B2_2),
-	?assertEqual({B2_2, validated}, get_block_and_status(bcache_test, B2_2#block.indep_hash)),
+	?assertMatch({B2_2, {validated, _}},
+			get_block_and_status(bcache_test, B2_2#block.indep_hash)),
 	?assertMatch({B2_3, [B2_2, B2], {{not_validated, ExpectedStatus}, _}},
 			get_earliest_not_validated_from_longest_chain(bcache_test)),
 	assert_longest_chain([B2_2, B2, B1], 1),
@@ -1281,6 +1310,9 @@ block_cache_test() ->
 	assert_is_valid_fork(true, validated, B2_2),
 	assert_is_valid_fork(true, not_validated, B2_3),
 	assert_is_valid_fork(true, on_chain, B3),
+	?assertEqual([B2_2], get_siblings(bcache_test, B3)),
+	?assertEqual([B3], get_siblings(bcache_test, B2_2)),
+	?assertEqual([B2], get_siblings(bcache_test, B1_2)),
 
 	%% B3->B2->B1 fork is still heaviest
 	%%
@@ -1346,6 +1378,8 @@ block_cache_test() ->
 	assert_is_valid_fork(true, not_validated, B2_3),
 	assert_is_valid_fork(true, validated, B3),
 	assert_is_valid_fork(true, not_validated, B4),
+	?assertEqual([], get_siblings(bcache_test, B2_3)),
+	?assertEqual([], get_siblings(bcache_test, B4)),
 
 	%% Height	Block/Status
 	%%
@@ -1494,8 +1528,9 @@ block_cache_test() ->
 	%% 0					B11/on_chain
 	mark_nonce_limiter_validated(bcache_test, crypto:strong_rand_bytes(48)),
 	mark_nonce_limiter_validated(bcache_test, block_id(B13)),
-	?assertEqual({B13, on_chain}, get_block_and_status(bcache_test, block_id(B13))),
-	?assertMatch({B14, {not_validated, awaiting_nonce_limiter_validation}},
+	?assertMatch({B13, {on_chain, _}},
+			get_block_and_status(bcache_test, block_id(B13))),
+	?assertMatch({B14, {{not_validated, awaiting_nonce_limiter_validation}, _}},
 			get_block_and_status(bcache_test, block_id(B14))),
 	assert_longest_chain([B13, B11], 0),
 	assert_tip(block_id(B13)),
@@ -1512,7 +1547,7 @@ block_cache_test() ->
 	%% 1		B12/not_validated    B13/on_chain
 	%%					  \              /
 	%% 0					B11/on_chain
-	?assertMatch({B14, {not_validated, awaiting_nonce_limiter_validation}},
+	?assertMatch({B14, {{not_validated, awaiting_nonce_limiter_validation}, _}},
 			get_block_and_status(bcache_test, block_id(B14))),
 	?assertMatch({B14, [B13], {{not_validated, awaiting_nonce_limiter_validation}, _}},
 			get_earliest_not_validated_from_longest_chain(bcache_test)),
@@ -1532,7 +1567,7 @@ block_cache_test() ->
 	%%					  \              /
 	%% 0					B11/on_chain
 	mark_nonce_limiter_validated(bcache_test, block_id(B14)),
-	?assertMatch({B14, {not_validated, nonce_limiter_validated}},
+	?assertMatch({B14, {{not_validated, nonce_limiter_validated}, _}},
 			get_block_and_status(bcache_test, block_id(B14))),
 	?assertMatch({B14, [B13], {{not_validated, nonce_limiter_validated}, _}},
 			get_earliest_not_validated_from_longest_chain(bcache_test)),
@@ -1578,7 +1613,7 @@ block_cache_test() ->
 	add_validated(bcache_test, B14),
 	?assertMatch({B15, [B14, B13], {{not_validated, awaiting_nonce_limiter_validation}, _}},
 			get_earliest_not_validated_from_longest_chain(bcache_test)),
-	?assertMatch({B14, validated}, get_block_and_status(bcache_test, block_id(B14))),
+	?assertMatch({B14, {validated, _}}, get_block_and_status(bcache_test, block_id(B14))),
 	assert_longest_chain([B14, B13, B11], 1),
 	assert_tip(block_id(B13)),
 	assert_max_cdiff({3, block_id(B15)}),
@@ -1626,7 +1661,7 @@ block_cache_test() ->
 	mark_nonce_limiter_validated(bcache_test, block_id(B16)),
 	?assertMatch({B15, [B14, B13], {{not_validated, awaiting_nonce_limiter_validation}, _}},
 			get_earliest_not_validated_from_longest_chain(bcache_test)),
-	?assertMatch({B16, {not_validated, nonce_limiter_validated}},
+	?assertMatch({B16, {{not_validated, nonce_limiter_validated}, _}},
 			get_block_and_status(bcache_test, block_id(B16))),
 	assert_longest_chain([B14, B13, B11], 1),
 	assert_tip(block_id(B13)),
@@ -1650,7 +1685,7 @@ block_cache_test() ->
 	%%					  \              /
 	%% 0					B11/on_chain
 	mark_tip(bcache_test, block_id(B14)),
-	?assertEqual({B14, on_chain}, get_block_and_status(bcache_test, block_id(B14))),
+	?assertMatch({B14, {on_chain, _}}, get_block_and_status(bcache_test, block_id(B14))),
 	?assertMatch({B15, [B14], {{not_validated, awaiting_nonce_limiter_validation}, _}},
 			get_earliest_not_validated_from_longest_chain(bcache_test)),
 	assert_longest_chain([B14, B13, B11], 0),

apps/arweave/src/ar_http_iface_client.erl

@@ -520,7 +520,7 @@ get_vdf_update(Peer) ->
 			timeout => 2000, headers => p2p_headers()
 			}) of
 		{ok, {{<<"200">>, _}, _, Bin, _, _}} ->
-			ar_serialize:binary_to_nonce_limiter_update(Bin);
+			ar_serialize:binary_to_nonce_limiter_update(2, Bin);
 		{ok, {{<<"404">>, _}, _, _, _, _}} ->
 			{error, not_found};
 		{ok, {{Status, _}, _, ResponseBody, _, _}} ->
@@ -530,10 +530,10 @@ get_vdf_update(Peer) ->
 	end.
 
 get_vdf_session(Peer) ->
-	case ar_http:req(#{ peer => Peer, method => get, path => "/vdf2/session",
+	case ar_http:req(#{ peer => Peer, method => get, path => "/vdf3/session",
 			timeout => 10000, headers => p2p_headers() }) of
 		{ok, {{<<"200">>, _}, _, Bin, _, _}} ->
-			ar_serialize:binary_to_nonce_limiter_update(Bin);
+			ar_serialize:binary_to_nonce_limiter_update(3, Bin);
 		{ok, {{<<"404">>, _}, _, _, _, _}} ->
 			{error, not_found};
 		{ok, {{Status, _}, _, ResponseBody, _, _}} ->
@@ -546,7 +546,7 @@ get_previous_vdf_session(Peer) ->
 	case ar_http:req(#{ peer => Peer, method => get, path => "/vdf2/previous_session",
 			timeout => 10000, headers => p2p_headers() }) of
 		{ok, {{<<"200">>, _}, _, Bin, _, _}} ->
-			ar_serialize:binary_to_nonce_limiter_update(Bin);
+			ar_serialize:binary_to_nonce_limiter_update(2, Bin);
 		{ok, {{<<"404">>, _}, _, _, _, _}} ->
 			{error, not_found};
 		{ok, {{Status, _}, _, ResponseBody, _, _}} ->

apps/arweave/src/ar_http_iface_middleware.erl

@@ -836,7 +836,7 @@ handle(<<"GET">>, [<<"reward_history">>, EncodedBH], Req, _Pid) ->
 				{ok, BH} ->
 					Fork_2_6 = ar_fork:height_2_6(),
 					case ar_block_cache:get_block_and_status(block_cache, BH) of
-						{#block{ height = Height, reward_history = RewardHistory }, Status}
+						{#block{ height = Height, reward_history = RewardHistory }, {Status, _}}
 								when (Status == on_chain orelse Status == validated),
 									Height >= Fork_2_6 ->
 							{200, #{}, ar_serialize:reward_history_to_binary(RewardHistory),
@@ -859,7 +859,7 @@ handle(<<"GET">>, [<<"block_time_history">>, EncodedBH], Req, _Pid) ->
 					Fork_2_7 = ar_fork:height_2_7(),
 					case ar_block_cache:get_block_and_status(block_cache, BH) of
 						{#block{ height = Height,
-									block_time_history = BlockTimeHistory }, Status}
+									block_time_history = BlockTimeHistory }, {Status, _}}
 								when (Status == on_chain orelse Status == validated),
 									Height >= Fork_2_7 ->
 							{200, #{}, ar_serialize:block_time_history_to_binary(
@@ -1286,7 +1286,7 @@ handle(<<"GET">>, [<<"vdf">>], Req, _Pid) ->
 		false ->
 			not_joined(Req);
 		true ->
-			handle_get_vdf(Req, get_update, 1)
+			handle_get_vdf(Req, get_update, 2)
 	end;
 
 %% Serve an VDF update to a configured VDF client.
@@ -1306,7 +1306,7 @@ handle(<<"GET">>, [<<"vdf">>, <<"session">>], Req, _Pid) ->
 		false ->
 			not_joined(Req);
 		true ->
-			handle_get_vdf(Req, get_session, 1)
+			handle_get_vdf(Req, get_session, 2)
 	end;
 
 %% Serve the current VDF session to a configured VDF client.
@@ -1319,14 +1319,24 @@ handle(<<"GET">>, [<<"vdf2">>, <<"session">>], Req, _Pid) ->
 			handle_get_vdf(Req, get_session, 2)
 	end;
 
+%% Serve the current VDF session to a configured VDF client.
+%% GET request to /vdf3/session.
+handle(<<"GET">>, [<<"vdf3">>, <<"session">>], Req, _Pid) ->
+	case ar_node:is_joined() of
+		false ->
+			not_joined(Req);
+		true ->
+			handle_get_vdf(Req, get_session, 3)
+	end;
+
 %% Serve the previous VDF session to a configured VDF client.
 %% GET request to /vdf/previous_session.
 handle(<<"GET">>, [<<"vdf">>, <<"previous_session">>], Req, _Pid) ->
 	case ar_node:is_joined() of
 		false ->
 			not_joined(Req);
 		true ->
-			handle_get_vdf(Req, get_previous_session, 1)
+			handle_get_vdf(Req, get_previous_session, 2)
 	end;
 
 %% Serve the previous VDF session to a configured VDF client.
@@ -3096,7 +3106,7 @@ handle_post_vdf2(Req, Pid, Peer) ->
 handle_post_vdf3(Req, Pid, Peer) ->
 	case read_complete_body(Req, Pid) of
 		{ok, Body, Req2} ->
-			case ar_serialize:binary_to_nonce_limiter_update(Body) of
+			case ar_serialize:binary_to_nonce_limiter_update(2, Body) of
 				{ok, Update} ->
 					case ar_nonce_limiter:apply_external_update(Update, Peer) of
 						ok ->
@@ -3136,18 +3146,17 @@ handle_get_vdf2(Req, Call, Format) ->
 	Update =
 		case Call of
 			get_update ->
-				ar_nonce_limiter_server:get_update();
+				ar_nonce_limiter_server:get_update(Format);
 			get_session ->
-				ar_nonce_limiter_server:get_full_update();
+				ar_nonce_limiter_server:get_full_update(Format);
 			get_previous_session ->
-				ar_nonce_limiter_server:get_full_prev_update()
+				ar_nonce_limiter_server:get_full_prev_update(Format)
 		end,
 	case Update of
 		not_found ->
 			{404, #{}, <<>>, Req};
 		Update ->
-			Bin = ar_serialize:nonce_limiter_update_to_binary(Format, Update),
-			{200, #{}, Bin, Req}
+			{200, #{}, Update, Req}
 	end.
 
 read_complete_body(Req, Pid) ->

apps/arweave/src/ar_http_iface_server.erl

@@ -121,6 +121,9 @@ name_route([<<"vdf">>, <<"session">>]) ->
 	"/vdf/session";
 name_route([<<"vdf2">>, <<"session">>]) ->
 	"/vdf2/session";
+name_route([<<"vdf3">>, <<"session">>]) ->
+	"/vdf3/session";
+
 name_route([<<"vdf">>, <<"previous_session">>]) ->
 	"/vdf/previous_session";
 name_route([<<"vdf2">>, <<"previous_session">>]) ->

apps/arweave/src/ar_node.erl

@@ -241,7 +241,7 @@ get_partition_upper_bound(BI) ->
 
 get_recent_partition_upper_bound_by_prev_h(H, Diff) ->
 	case ar_block_cache:get_block_and_status(block_cache, H) of
-		{_B, on_chain} ->
+		{_B, {on_chain, _}} ->
 			[{_, BI}] = ets:lookup(node_state, recent_block_index),
 			Genesis = length(BI) =< ?SEARCH_SPACE_UPPER_BOUND_DEPTH,
 			get_recent_partition_upper_bound_by_prev_h(H, Diff, BI, Genesis);