Merge pull request #1359 from helium/jg/skip_receipt_val_var

var gated bypass of witness validation
helium · May 21, 2022 · ce5f544 · ce5f544
2 parents 3680616 + da211c1
commit ce5f544
Show file tree

Hide file tree

Showing 5 changed files with 385 additions and 15 deletions.
diff --git a/include/blockchain_vars.hrl b/include/blockchain_vars.hrl
@@ -226,6 +226,9 @@
 %% the number of random hexes to utilize when targeting: integer
 -define(poc_target_pool_size, poc_target_pool_size).
 
+%% whether or not to process validation of poc receipt witnesses
+-define(poc_receipt_witness_validation, poc_receipt_witness_validation).
+
 %%%
 %%% score vars
 %%%

diff --git a/src/transactions/v1/blockchain_txn_vars_v1.erl b/src/transactions/v1/blockchain_txn_vars_v1.erl
@@ -1142,6 +1142,8 @@ validate_var(?poc_hexing_type, Value) ->
   end;
 validate_var(?poc_validator_ct_scale, Value) ->
     validate_float(Value, "poc_validator_ct_scale", 0.1, 1.0);
+validate_var(?poc_receipt_witness_validation, Value) when is_boolean(Value) -> ok;
+validate_var(?poc_receipt_witness_validation, Value) -> throw({error, poc_receipt_witness_validation, Value});
 
 %% score vars
 validate_var(?alpha_decay, Value) ->

diff --git a/src/transactions/v2/blockchain_txn_poc_receipts_v2.erl b/src/transactions/v2/blockchain_txn_poc_receipts_v2.erl
@@ -326,7 +326,13 @@ poc_particpants(Txn, Chain) ->
                                     _ ->
                                         {lists:nth(ElementPos - 1, Path), lists:nth(ElementPos - 1, Channels), lists:nth(ElementPos, Channels)}
                                 end,
-                            Witnesses = valid_witness_addrs(Element, WitnessChannel, Ledger),
+                            Witnesses = case blockchain:config(?poc_receipt_witness_validation, Ledger) of
+                                            {ok, false} ->
+                                                UnvalidatedWitnesses = lists:reverse(blockchain_poc_path_element_v1:witnesses(Element)),
+                                                [W#blockchain_poc_witness_v1_pb.gateway || W <- UnvalidatedWitnesses];
+                                            _ ->
+                                                valid_witness_addrs(Element, WitnessChannel, Ledger)
+                                        end,
                             %% only include the challengee in the poc participants list
                             %% if we have received a receipt
                             ElemParticipants =
@@ -855,8 +861,8 @@ valid_receipt(PreviousElement, Element, Channel, Ledger) ->
                       Channel :: non_neg_integer(),
                       Ledger :: blockchain_ledger_v1:ledger()) -> blockchain_poc_witness_v1:poc_witnesses().
 valid_witnesses(Element, Channel, Ledger) ->
-    TaggedWitnesses = tagged_witnesses(Element, Channel, Ledger),
-    [ W || {true, _, W} <- TaggedWitnesses ].
+    {ok, RegionVars} = blockchain_region_v1:get_all_region_bins(Ledger),
+    valid_witnesses(Element, Channel, RegionVars, Ledger).
 
 valid_witnesses(Element, Channel, RegionVars, Ledger) ->
     TaggedWitnesses = tagged_witnesses(Element, Channel, RegionVars, Ledger),
@@ -866,8 +872,8 @@ valid_witnesses(Element, Channel, RegionVars, Ledger) ->
                       Channel :: non_neg_integer(),
                       Ledger :: blockchain_ledger_v1:ledger()) -> [libp2p_crypto:pubkey_bin()].
 valid_witness_addrs(Element, Channel, Ledger) ->
-    TaggedWitnesses = tagged_witnesses(Element, Channel, Ledger),
-    [ W#blockchain_poc_witness_v1_pb.gateway || {true, _, W} <- TaggedWitnesses ].
+    ValidWitnesses = valid_witnesses(Element, Channel, Ledger),
+    [W#blockchain_poc_witness_v1_pb.gateway || W <- ValidWitnesses].
 
 -spec is_too_far(Limit :: any(),
                  SrcLoc :: h3:h3_index(),
@@ -943,7 +949,7 @@ tagged_witnesses(Element, Channel, RegionVars0, Ledger) ->
     Limit = blockchain:config(?poc_distance_limit, Ledger),
     Version = poc_version(Ledger),
 
-    lists:foldl(fun(Witness, Acc) ->
+    TaggedWitnesses = lists:foldl(fun(Witness, Acc) ->
                          DstPubkeyBin = blockchain_poc_witness_v1:gateway(Witness),
                          {ok, DestinationLoc} = blockchain_ledger_v1:find_gateway_location(DstPubkeyBin, Ledger),
 %%                            case blockchain_region_v1:h3_to_region(DestinationLoc, Ledger, RegionVars) of
@@ -1036,7 +1042,12 @@ tagged_witnesses(Element, Channel, RegionVars0, Ledger) ->
                                          end
                                  end
                          end
-                 end, [], Witnesses).
+                 end, [], Witnesses),
+    WitnessCount = length(Witnesses),
+    TaggedWitnessCount = length(TaggedWitnesses),
+    lager:debug("filtered ~p of ~p witnesses for receipt ~p", [(WitnessCount - TaggedWitnessCount),
+                                                               WitnessCount, blockchain_poc_path_element_v1:receipt(Element)]),
+    TaggedWitnesses.
 
 -spec get_channels(Txn :: txn_poc_receipts(),
                    Chain :: blockchain:blockchain()) -> {ok, [non_neg_integer()]} | {error, any()}.

diff --git a/src/transactions/v2/blockchain_txn_rewards_v2.erl b/src/transactions/v2/blockchain_txn_rewards_v2.erl
@@ -1223,8 +1223,7 @@ poc_witness_reward(Txn, AccIn,
                         ValidWitnesses =
                             case get({KeyHash, ElemHash}) of
                                 undefined ->
-                                    VW = TxnType:valid_witnesses(Elem, WitnessChannel,
-                                                                                        RegionVars, Ledger),
+                                    VW = TxnType:valid_witnesses(Elem, WitnessChannel, RegionVars, Ledger),
                                     put({KeyHash, ElemHash}, VW),
                                     VW;
                                 VW -> VW