diff --git a/alfis.toml b/alfis.toml index 9de947b..183c2e5 100644 --- a/alfis.toml +++ b/alfis.toml @@ -21,7 +21,7 @@ yggdrasil_only = false # Your DNS resolver will be listening on this address and port (Usual port is 53) listen = "127.0.0.1:53" # How many threads to spawn by DNS server -threads = 50 +threads = 10 # AdGuard DNS servers to filter ads and trackers forwarders = ["https://dns.adguard.com/dns-query"] #forwarders = ["94.140.14.14:53", "94.140.15.15:53"] diff --git a/src/blockchain/block.rs b/src/blockchain/block.rs index 4efde12..567282a 100644 --- a/src/blockchain/block.rs +++ b/src/blockchain/block.rs @@ -98,6 +98,10 @@ impl Block { return true; } + if my_diff == it_diff && self.nonce != other.nonce { + return self.nonce < other.nonce; + } + false } } \ No newline at end of file diff --git a/src/dns/client.rs b/src/dns/client.rs index fffd893..b4bf267 100644 --- a/src/dns/client.rs +++ b/src/dns/client.rs @@ -406,7 +406,7 @@ impl HttpsDnsClient { let agent = ureq::AgentBuilder::new() .user_agent(&client_name) .timeout(std::time::Duration::from_secs(5)) - .max_idle_connections_per_host(8) + .max_idle_connections_per_host(2) .max_idle_connections(16) .resolver(move |addr: &str| { let addr = match addr.find(':') { diff --git a/src/web_ui.rs b/src/web_ui.rs index 056346b..be70844 100644 --- a/src/web_ui.rs +++ b/src/web_ui.rs @@ -442,7 +442,7 @@ fn action_create_domain(context: Arc>, miner: Arc>, }; match context.chain.can_mine_domain(context.chain.get_height(), &name, &pub_key) { MineResult::Fine => { - std::mem::drop(context); + drop(context); create_domain(c, miner, CLASS_DOMAIN, &name, data, DOMAIN_DIFFICULTY, &keystore, signing, encryption, renewal); let _ = web_view.eval("domainMiningStarted();"); event_info(web_view, &format!("Mining of domain \\'{}\\' has started", &name));