Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Fix registrar errors early in the chain #11257

Merged
merged 1 commit into from
Nov 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion miner/src/service_transaction_checker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ impl ServiceTransactionChecker {
client: &C,
tx: &SignedTransaction
) -> Result<bool, String> {
let sender = tx.sender();
// Skip checking the contract if the transaction does not have zero gas price
if !tx.gas_price.is_zero() {
return Ok(false)
}

let sender = tx.sender();
self.check_address(client, sender)
}

Expand Down
5 changes: 3 additions & 2 deletions util/registrar/src/registrar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ pub trait RegistrarClient: CallContract + Send + Sync {
let id = encode_input(hashed_key, DNS_A_RECORD);

let address_bytes = self.call_contract(block, registrar_address, id)?;

if address_bytes.is_empty() {
return Ok(None)
}
let address = decode_output(&address_bytes).map_err(|e| e.to_string())?;

if address.is_zero() {
Ok(None)
} else {
Expand Down