Merge pull request #1887 from helium/adt/isolate-var-txns

If the `isolate_var_txns` var is set, put var txns in their own block
helium · Jan 23, 2023 · 7693655 · 7693655
2 parents dfdcf1c + fa86d1b
commit 7693655
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/rebar.lock b/rebar.lock
@@ -8,7 +8,7 @@
  {<<"base64url">>,{pkg,<<"base64url">>,<<"1.0.1">>},1},
  {<<"blockchain">>,
   {git,"https://github.com/helium/blockchain-core.git",
-       {ref,"abec0d7fea2477da857a2ceebd9a717909150399"}},
+       {ref,"7db8d2662220281eeb52d9852d4a7a4693889ac4"}},
   0},
  {<<"certifi">>,{pkg,<<"certifi">>,<<"2.9.0">>},2},
  {<<"chatterbox">>,

diff --git a/src/miner.erl b/src/miner.erl
@@ -716,7 +716,14 @@ select_transactions(Chain, Txns, {ElectionEpoch0, EpochStart0}, BlockHeightCurr,
                      ),
                 {Epoch, BlockHeightNext, Transactions, InvalidTransactions};
             _ ->
-                {ElectionEpoch0, EpochStart0, ValidTransactions, InvalidTransactions}
+            %% try to isolate the var txn in its own block
+            case {blockchain:config(?isolate_var_txns, Ledger), lists:filter(fun(T) -> blockchain_txn:type(T) == blockchain_txn_vars_v1 end, ValidTransactions)} of
+                {{ok, true}, [VarTxn|_]} ->
+                    %% take the first var txn found as the only txn in a block
+                    {ElectionEpoch0, EpochStart0, [VarTxn], InvalidTransactions};
+                _ ->
+                    {ElectionEpoch0, EpochStart0, ValidTransactions, InvalidTransactions}
+            end
         end.
 
 -spec txn_is_rewards(blockchain_txn:txn()) -> boolean().