diff --git a/docker/beam-node/main-release-mining/Dockerfile b/docker/beam-node/main-release-mining/Dockerfile index fc11fbea8..aaadf325c 100644 --- a/docker/beam-node/main-release-mining/Dockerfile +++ b/docker/beam-node/main-release-mining/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get install -y libboost-all-dev curl wget unzip git cmake # build bitcoind RUN mkdir /work -RUN cd /work && git clone -b mining-btccom --depth 1 https://github.com/btccom/beam.git +RUN cd /work && git clone -b mining-hard-fork --depth 1 https://github.com/btccom/beam.git RUN cd /work/beam \ && cmake -DCMAKE_BUILD_TYPE=Release -DBEAM_NO_QT_UI_WALLET=ON . \ #&& make && make install diff --git a/docker/beam-node/main-release-mining/README.md b/docker/beam-node/main-release-mining/README.md index 5df97eb3e..7c1f568d0 100644 --- a/docker/beam-node/main-release-mining/README.md +++ b/docker/beam-node/main-release-mining/README.md @@ -72,19 +72,19 @@ stratum_port=3333 stratum_secrets_path=. # Owner viewer key -key_owner= +owner_key= # Standalone miner key -key_mine= +miner_key= # password for keys pass= ``` -### got `key_owner` and `key_mine` +### got `owner_key` and `miner_key` Use [beam-wallet-cli](https://github.com/BeamMW/beam/releases) with these commands: ``` -./beam-wallet export_miner_key --subkey=1 ./beam-wallet export_owner_key +./beam-wallet export_miner_key --subkey=1 ``` Or see [this document](https://beam-docs.readthedocs.io/en/latest/rtd_pages/user_mining_beam.html#mining-using-external-miner) for details. diff --git a/docker/beam-node/v2.0.4431-btcpool/Dockerfile b/docker/beam-node/v2.0.4431-btcpool/Dockerfile deleted file mode 100644 index f577ac613..000000000 --- a/docker/beam-node/v2.0.4431-btcpool/Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -# -# Dockerfile -# -# @author zhibiao.pan@bitmain.com, yihao.peng@bitmain.com -# @copyright btc.com -# @since 2016-08-01 -# -# -FROM phusion/baseimage:0.11 -MAINTAINER YihaoPeng - -ENV HOME /root -ENV TERM xterm -CMD ["/sbin/my_init"] - -# use aliyun source -ADD sources-aliyun.com.list /etc/apt/sources.list - -RUN apt-get update -RUN apt-get install -y build-essential libtool pkg-config libssl-dev -RUN apt-get install -y libboost-all-dev curl wget unzip git cmake - -# build bitcoind -RUN mkdir /work -RUN cd /work && git clone -b v2.0.4431-btcpool --depth 1 https://github.com/btccom/beam.git -RUN cd /work/beam \ - && cmake -DCMAKE_BUILD_TYPE=Release -DBEAM_NO_QT_UI_WALLET=ON . \ - #&& make && make install - && make -j$(nproc) - -# mkdir bitcoind data dir -RUN mkdir -p /work/beam-node - -# -# services -# - -# service for mainnet -RUN mkdir /etc/service/beam-node -ADD run /etc/service/beam-node/run -RUN chmod +x /etc/service/beam-node/run diff --git a/docker/beam-node/v2.0.4431-btcpool/README.md b/docker/beam-node/v2.0.4431-btcpool/README.md deleted file mode 100644 index 683ac6737..000000000 --- a/docker/beam-node/v2.0.4431-btcpool/README.md +++ /dev/null @@ -1,137 +0,0 @@ -Docker for beam-node (patched for mining) -============================ - -* Docker Image OS: `Ubuntu 18.04 LTS` -* beam-node: `v2.0.4431-btcpool` - -## Install Docker - -``` -# Use 'curl -sSL https://get.daocloud.io/docker | sh' instead of this line -# when your server is in China. -wget -qO- https://get.docker.com/ | sh - -service docker start -service docker status -``` - -## Build Docker Images - -``` -cd /work - -git clone https://github.com/btccom/btcpool.git -cd btcpool/docker/beam-node/v2.0.4431-btcpool - -# If your server is not in China, you may want edit "Dockerfile" and comment `ADD sources-aliyun.com.list`. - -# build -docker build -t beam-node:v2.0.4431-btcpool . -# docker build --no-cache -t beam-node:v2.0.4431-btcpool . - -# mkdir for beam-node -mkdir -p /work/beam-node - -# create TLS certificate for Stratum protocol -cd /work/beam-node -openssl genrsa -out stratum.key 2048 -openssl req -new -key stratum.key -out stratum.crt.req -openssl x509 -req -days 365 -in stratum.crt.req -signkey stratum.key -out stratum.crt - -# beam-node.cfg -vim /work/beam-node/beam-node.cfg -``` - -### beam-node.cfg example - -``` -# port to start server on -port=8100 - -# log level [info|debug|verbose] -log_level=info - -# file log level [info|debug|verbose] -file_log_level=info - -# number of mining threads(there is no mining if 0) -mining_threads=0 - -# nodes to connect to -# WARNING: Use domain name in peer list is unsafe because of this issue: -# -# Please use IP insteads. -peer = 52.220.54.222:8100 -peer = 54.151.57.34:8100 -peer = 18.197.8.221:8100 - -# port to start stratum server on -stratum_port=3333 - -# path to stratum server api keys file, and tls certificate and private key -stratum_secrets_path=. - -# Owner viewer key -key_owner= - -# Standalone miner key -key_mine= - -# password for keys -pass= -``` -### got `key_owner` and `key_mine` -Use [beam-wallet-cli](https://github.com/BeamMW/beam/releases) with these commands: -``` -./beam-wallet export_miner_key --subkey=1 -./beam-wallet export_owner_key -``` - -Or see [this document](https://beam-docs.readthedocs.io/en/latest/rtd_pages/user_mining_beam.html#mining-using-external-miner) for details. - -Notice: the `pass` is the password you entered in `export_miner_key`. - -## Start Docker Container - -``` -# start docker -docker run -it -v /work/beam-node:/work/beam-node --name beam-node -p 8100:8100 -p 3333:3333 --restart always -d beam-node:v2.0.4431-btcpool - -# login -docker exec -it beam-node /bin/bash -``` - -## Test stratum port (like `telnet localhost 3333`) - -The Stratum port of beam-node forces TLS, so you cannot connect to it using telnet. But the openssl command provides a `telnet over TLS` feature: -```bash -openssl s_client -connect localhost:3333 -``` - -Then input this line with enter: -```json -{"method":"login","api_key":"anything","id":"login","jsonrpc":"2.0"} -``` - -If anything is OK, you will receive a stratum job as a response. It looks like: -```json -{"difficulty":440836216,"height":6656,"id":"487","input":"6a35dae05f5d6b16e419e31ede77c94bf1cec7a6a822636cea10f9c8897914d5","jsonrpc":"2.0","method":"job"} -``` - -## ACL of Stratum port - -You can create a `stratum.api.keys` file contains a list of allowed api_keys. - -An API key should contain any number of strings at least 7 symbols long without spaces. -``` -vim /work/beam-node/stratum.api.keys -``` -``` -12345678 -sfdskjhfdksk -984398349834 -``` - -If there is no stratum.api.keys, ACL will be switched off. - -Please note that stratum.api.key file is reloaded by `beam-node` every 5 seconds, if you want to add/delete/edit key you shouldn't restart beam-node, just edit `stratum.api.keys` file. diff --git a/docker/beam-node/v2.0.4431-btcpool/run b/docker/beam-node/v2.0.4431-btcpool/run deleted file mode 100644 index 62fb8dc28..000000000 --- a/docker/beam-node/v2.0.4431-btcpool/run +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/bash -# -# run shell for bitcoind -# -# @copyright btc.com -# @author yihao.peng@bitmain.com -# -cd /work/beam-node -exec /work/beam/beam/beam-node diff --git a/docker/beam-node/v2.0.4431-btcpool/sources-aliyun.com.list b/docker/beam-node/v2.0.4431-btcpool/sources-aliyun.com.list deleted file mode 100644 index b2d8e354e..000000000 --- a/docker/beam-node/v2.0.4431-btcpool/sources-aliyun.com.list +++ /dev/null @@ -1,10 +0,0 @@ -deb http://mirrors.aliyun.com/ubuntu/ bionic main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ bionic-proposed main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ bionic main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ bionic-proposed main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse