Merge branch 'e24'

Author: cleverfox

apps/tpnode/src/block.erl

@@ -512,8 +512,10 @@ binarize_settings([]) -> [];
 binarize_settings([{TxID, Patch}|Rest]) ->
   [{TxID, pack_patch(Patch)}|binarize_settings(Rest)].
 
-pack_patch(#{ patch:=P }) ->
-  tx:pack(tx:construct_tx(#{patches=>P, kind=>patch, ver=>2}));
+pack_patch(#{ patch:=_LPatch }=OldTX) ->
+  tx:pack(OldTX);
+%  tx:pack(tx:construct_tx(#{patches=>P, kind=>patch, ver=>2}));
+
 pack_patch(#{ kind:=patch, ver:=2, patches:=_, body:=_ }=Patch) ->
   tx:pack(Patch);
 pack_patch(#{ kind:=patch, ver:=2, patches:=_ }=Patch) ->

apps/tpnode/src/mkblock_genblk.erl

@@ -263,8 +263,8 @@ run_generate(
   catch throw:empty ->
           ?LOG_INFO("Skip empty block"),
           skip;
-        throw:Other ->
-          ?LOG_INFO("Skip ~p",[Other]),
+        throw:Other:Stack ->
+          ?LOG_NOTICE("Skip ~p @ ~p",[Other,hd(Stack)]),
           error
   end.