diff --git a/rebar.config b/rebar.config index e56d63088..85d413a0d 100644 --- a/rebar.config +++ b/rebar.config @@ -10,7 +10,7 @@ {deps, [ {blockchain, {git, "git@github.com:helium/blockchain-core.git", - {branch, "master"}}}, + {branch, "macpie/assertloc"}}}, {hbbft, {git, "https://github.com/helium/erlang-hbbft.git", {branch, "master"}}}, {dkg, {git, "https://github.com/helium/erlang-dkg.git", {branch, "master"}}}, {ecc508, {git, "https://github.com/helium/ecc508.git", {branch, "master"}}}, diff --git a/rebar.lock b/rebar.lock index 1486b555c..1c6dc7576 100644 --- a/rebar.lock +++ b/rebar.lock @@ -3,7 +3,7 @@ {<<"base32">>,{pkg,<<"base32">>,<<"0.1.0">>},3}, {<<"blockchain">>, {git,"git@github.com:helium/blockchain-core.git", - {ref,"b0bd97938ae06fe8915c207cc5352f6bbae1d5f6"}}, + {ref,"7664d2e03a150dd4e4a6acb14c140eea8f1c5bae"}}, 0}, {<<"clique">>, {git,"https://github.com/helium/clique.git", diff --git a/src/miner.erl b/src/miner.erl index eb0720aaa..b5cf08ac0 100644 --- a/src/miner.erl +++ b/src/miner.erl @@ -341,7 +341,9 @@ handle_call({assert_loc_txn, H3Index, Owner, Payer, Nonce, StakingFee, Fee}, _Fr PubKeyBin = libp2p_crypto:pubkey_to_bin(PubKey), Txn = blockchain_txn_assert_location_v1:new(PubKeyBin, Owner, Payer, H3Index, Nonce, StakingFee, Fee), SignedTxn = blockchain_txn_assert_location_v1:sign_request(Txn, SigFun), - {reply, {ok, blockchain_txn:serialize(SignedTxn)}, State}; + GatewaySign = blockchain_txn_assert_location_v1:gateway_signature(SignedTxn), + ReducedTxn = blockchain_txn_assert_location_v1:new(PubKeyBin, GatewaySign, H3Index), + {reply, {ok, blockchain_txn:serialize(ReducedTxn)}, State}; handle_call(consensus_group, _From, State) -> {reply, State#state.consensus_group, State}; handle_call({handoff_consensus, NewConsensusGroup, ElectionHeight}, _From,