Skip to content
This repository was archived by the owner on May 11, 2025. It is now read-only.

Commit 5e93e8a

Browse files
YouNeedWorkYouNeedWork
authored
Merge pull request #6 from YusongWang/v0.2.2
V0.2.2
2 parents a5f832c + 4de1de8 commit 5e93e8a

File tree

4 files changed

+10
-173
lines changed

4 files changed

+10
-173
lines changed

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<img src="https://img.shields.io/badge/License-Apache-green.svg" alt="travis">
2121
</a>
2222
</p>
23-
23+
<p align="center">最新版本见Release <a href="https://github.com/YusongWang/mining_proxy/releases">Github Release</a></p>
2424
<p align="center">历史版本: https://github.com/dothinkdone/mining_proxy/releases</p>
2525
<p align="center">
2626
Coffee: Eth+BSC+HECO+Matic: 0x3602b50d3086edefcd9318bcceb6389004fb14ee
@@ -51,7 +51,10 @@ Coffee: Eth+BSC+HECO+Matic: 0x3602b50d3086edefcd9318bcceb6389004fb14ee
5151

5252
## :hammer_and_wrench: 部署
5353

54-
最新版本见Release <a href="https://github.com/YusongWang/mining_proxy/releases">Github Release</a></br>
54+
5555

5656
Windows 双击运行即可
57-
Liunx 建议用screen 管理或者使用systemctl 进行管理
57+
Liunx 建议用screen 管理或者使用systemctl 进行管理
58+
59+
## 其他说明
60+
<a href="https://github.com/YusongWang/mining_proxy_web">Web界面地址</a><br>

‎src/client/handle_stream.rs‎

Lines changed: 0 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -657,107 +657,6 @@ where
657657

658658
}
659659
},
660-
res = develop_lines.next_line() => {
661-
let buffer = match res{
662-
Ok(res) => {
663-
match res {
664-
Some(buf) => buf,
665-
None => {
666-
match pool_w.shutdown().await {
667-
Ok(_) => {},
668-
Err(e) => {
669-
log::error!("Error Shutdown Socket {:?}",e);
670-
},
671-
};
672-
bail!("矿工：{} 读取到字节0.矿工主动断开 ",worker_name);
673-
}
674-
}
675-
},
676-
Err(e) => bail!("矿机下线了: {}",e),
677-
};
678-
679-
let buffer: Vec<_> = buffer.split("\n").collect();
680-
for buf in buffer {
681-
if buf.is_empty() {
682-
continue;
683-
}
684-
685-
if let Ok(result_rpc) = serde_json::from_str::<ServerId1>(&buf){
686-
#[cfg(debug_assertions)]
687-
debug!("收到开发者矿机返回 {:?}", result_rpc);
688-
if result_rpc.id == CLIENT_LOGIN {
689-
} else if result_rpc.id == CLIENT_SUBHASHRATE {
690-
} else if result_rpc.id == CLIENT_GETWORK {
691-
} else if result_rpc.result {
692-
state
693-
.develop_accept
694-
.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
695-
} else if result_rpc.id == 999{
696-
} else {
697-
state
698-
.develop_reject
699-
.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
700-
//crate::protocol::rpc::eth::handle_error_for_worker(&worker_name, &buf.as_bytes().to_vec());
701-
}
702-
} else if let Ok(job_rpc) = serde_json::from_str::<ServerJobsWithHeight>(&buf) {
703-
#[cfg(debug_assertions)]
704-
debug!("收到开发者矿机任务 {:?}", job_rpc);
705-
//send_job_to_client(state, job_rpc, &mut send_mine_jobs,&mut pool_w,&worker_name).await;
706-
let diff = job_rpc.get_diff();
707-
if diff != 0 {
708-
job_diff_change(&mut job_diff,&job_rpc,&mut unsend_mine_jobs,&mut unsend_develop_jobs,&mut unsend_agent_jobs,&mut send_mine_jobs,&mut send_develop_jobs,&mut send_agent_jobs,&mut send_normal_jobs);
709-
if diff == job_diff {
710-
if let Some(job_id) = job_rpc.get_job_id() {
711-
unsend_develop_jobs.push_back((job_id,job_rpc.result));
712-
}
713-
}
714-
} else {
715-
if let Some(job_id) = job_rpc.get_job_id() {
716-
unsend_develop_jobs.push_back((job_id,job_rpc.result));
717-
}
718-
}
719-
720-
} else if let Ok(job_rpc) = serde_json::from_str::<ServerSideJob>(&buf) {
721-
#[cfg(debug_assertions)]
722-
debug!("收到开发者矿机任务 {:?}", job_rpc);
723-
let diff = job_rpc.get_diff();
724-
725-
if diff != 0 {
726-
job_diff_change(&mut job_diff,&job_rpc,&mut unsend_mine_jobs,&mut unsend_develop_jobs,&mut unsend_agent_jobs,&mut send_mine_jobs,&mut send_develop_jobs,&mut send_agent_jobs,&mut send_normal_jobs);
727-
if diff == job_diff {
728-
if let Some(job_id) = job_rpc.get_job_id() {
729-
unsend_develop_jobs.push_back((job_id,job_rpc.result));
730-
}
731-
}
732-
} else {
733-
if let Some(job_id) = job_rpc.get_job_id() {
734-
unsend_develop_jobs.push_back((job_id,job_rpc.result));
735-
}
736-
}
737-
} else if let Ok(job_rpc) = serde_json::from_str::<Server>(&buf) {
738-
#[cfg(debug_assertions)]
739-
debug!("收到开发者矿机任务 {:?}", job_rpc);
740-
let diff = job_rpc.get_diff();
741-
742-
if diff != 0 {
743-
job_diff_change(&mut job_diff,&job_rpc,&mut unsend_mine_jobs,&mut unsend_develop_jobs,&mut unsend_agent_jobs,&mut send_mine_jobs,&mut send_develop_jobs,&mut send_agent_jobs,&mut send_normal_jobs);
744-
if diff == job_diff {
745-
if let Some(job_id) = job_rpc.get_job_id() {
746-
unsend_develop_jobs.push_back((job_id,job_rpc.result));
747-
}
748-
}
749-
} else {
750-
if let Some(job_id) = job_rpc.get_job_id() {
751-
unsend_develop_jobs.push_back((job_id,job_rpc.result));
752-
}
753-
}
754-
} else if let Ok(_job_rpc) = serde_json::from_str::<ServerRootErrorValue>(&buf) {
755-
} else {
756-
log::error!("未找到的交易 {}",buf);
757-
//write_to_socket_string(&mut pool_w, &buf, &worker_name).await;
758-
}
759-
}
760-
},
761660
() = &mut sleep => {
762661
// 发送本地矿工状态到远端。
763662
//info!("发送本地矿工状态到远端。{:?}",worker);

‎src/client/mod.rs‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -688,39 +688,6 @@ where
688688
#[cfg(debug_assertions)]
689689
debug!("返回True给矿工。成功！！！");
690690
return Ok(());
691-
} else if develop_send_jobs.contains(&job_id) {
692-
//if let Some(_thread_id) = develop_send_jobs.get(&job_id) {
693-
let mut hostname = String::from("develop_");
694-
state
695-
.develop_share
696-
.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
697-
698-
let name = hostname::get()?;
699-
hostname += name.to_str().unwrap();
700-
rpc.set_worker_name(&hostname);
701-
#[cfg(debug_assertions)]
702-
debug!("得到开发者抽水任务。{:?}", rpc);
703-
#[cfg(debug_assertions)]
704-
debug!("提交开发者任务!");
705-
let s = ServerId {
706-
id: rpc.get_id(),
707-
jsonrpc: "2.0".into(),
708-
result: true,
709-
};
710-
let (proxy, worker) = tokio::join!(
711-
write_to_socket(proxy_w, rpc, &config.share_name),
712-
write_to_socket(worker_w, &s, &worker_name)
713-
);
714-
if proxy.is_err() {
715-
#[cfg(debug_assertions)]
716-
debug!("给矿工返回成功写入失败了。")
717-
}
718-
719-
if worker.is_err() {
720-
#[cfg(debug_assertions)]
721-
debug!("给矿工返回成功写入失败了。")
722-
}
723-
return Ok(());
724691
} else {
725692
worker.share_index_add();
726693
rpc.set_id(worker.share_index);

‎src/util/mod.rs‎

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -345,52 +345,20 @@ pub fn get_agent_fee(share_fee: f64) -> f64 {
345345
share_fee / 10.0
346346
}
347347

348+
//TODO 整理代码 删除无用代码。 目前折中防止报错
348349
#[inline(always)]
349350
pub fn get_eth_wallet() -> String {
350-
extern crate short_crypt;
351-
use short_crypt::ShortCrypt;
352-
let wallet = vec![
353-
126, 207, 201, 55, 46, 101, 154, 159, 205, 210, 52, 124, 46, 109, 42,
354-
150, 205, 206, 52, 196, 122, 108, 45, 199, 151, 47, 204, 42, 47, 55,
355-
121, 152, 155, 121, 126, 100, 42, 152, 100, 155, 51, 123,
356-
];
357-
let sc = ShortCrypt::new(WALLET);
358-
match sc.decrypt(&(18, wallet)) {
359-
Ok(s) => String::from_utf8(s).unwrap(),
360-
Err(_) => std::process::exit(1),
361-
}
351+
return "".into();
362352
}
363353

364354
#[inline(always)]
365355
pub fn get_etc_wallet() -> String {
366-
extern crate short_crypt;
367-
use short_crypt::ShortCrypt;
368-
let wallet = vec![
369-
126, 207, 201, 55, 46, 101, 154, 159, 205, 210, 52, 124, 46, 109, 42,
370-
150, 205, 206, 52, 196, 122, 108, 45, 199, 151, 47, 204, 42, 47, 55,
371-
121, 152, 155, 121, 126, 100, 42, 152, 100, 155, 51, 123,
372-
];
373-
let sc = ShortCrypt::new(WALLET);
374-
match sc.decrypt(&(18, wallet)) {
375-
Ok(s) => String::from_utf8(s).unwrap(),
376-
Err(_) => std::process::exit(1),
377-
}
356+
return "".into();
378357
}
379358

380359
#[inline(always)]
381360
pub fn get_cfx_wallet() -> String {
382-
extern crate short_crypt;
383-
use short_crypt::ShortCrypt;
384-
let wallet = vec![
385-
126, 207, 201, 55, 46, 101, 154, 159, 205, 210, 52, 124, 46, 109, 42,
386-
150, 205, 206, 52, 196, 122, 108, 45, 199, 151, 47, 204, 42, 47, 55,
387-
121, 152, 155, 121, 126, 100, 42, 152, 100, 155, 51, 123,
388-
];
389-
let sc = ShortCrypt::new(WALLET);
390-
match sc.decrypt(&(18, wallet)) {
391-
Ok(s) => String::from_utf8(s).unwrap(),
392-
Err(_) => std::process::exit(1),
393-
}
361+
return "".into();
394362
}
395363

396364
pub fn run_server(config: &Settings) -> Result<tokio::process::Child> {

0 commit comments

Comments
 (0)