From e439d6c60043536fa6e43a826208620daf94d981 Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Wed, 16 Oct 2024 10:01:19 +0530 Subject: [PATCH 1/6] add ckpool --- conf/ckpool.conf | 24 +++++++++++ docker-compose-config-a.yaml | 58 ++++++++++++++++++--------- docker-compose-config-c.yaml | 77 +++++++++++++++++++++++------------- sv1-ckpool.dockerfile | 21 ++++++++++ 4 files changed, 135 insertions(+), 45 deletions(-) create mode 100644 conf/ckpool.conf create mode 100644 sv1-ckpool.dockerfile diff --git a/conf/ckpool.conf b/conf/ckpool.conf new file mode 100644 index 0000000..8569e37 --- /dev/null +++ b/conf/ckpool.conf @@ -0,0 +1,24 @@ +{ + "btcd": [ + { + "url": "http://10.5.0.21:18332", + "auth": "username", + "pass": "password", + "notify": false + } + ], + "btcsig": "/mined by docker-ckpool/", + "blockpoll": 100, + "nonce1length": 4, + "nonce2length": 8, + "update_interval": 30, + "version_mask": "1fffe000", + "serverurl": [ + "10.5.0.40:3332" + ], + "mindiff": 1, + "startdiff": 42, + "maxdiff": 0, + "zmqblock": "tcp://10.5.0.16:28332", + "logdir": "logs" +} diff --git a/docker-compose-config-a.yaml b/docker-compose-config-a.yaml index a393df6..edd081d 100644 --- a/docker-compose-config-a.yaml +++ b/docker-compose-config-a.yaml @@ -316,30 +316,52 @@ services: sv2-net: ipv4_address: 10.5.0.23 - sv1-pool: - container_name: sv1-pool + # sv1-pool: + # container_name: sv1-pool + # labels: + # logging: "config-a" + # build: + # context: . + # dockerfile: ./sv1-public-pool.dockerfile + # ports: + # - "3332:3332" + # - "3334:3334" + # volumes: + # - "./testnet-DB:/public-pool/DB" + # - "./custom-configs/sv1-pool/.env:/public-pool/.env:ro" + # - "./custom-configs/sv1-pool/rpc.js:/public-pool/node_modules/rpc-bitcoin/build/src/rpc.js" # to fix rpc-version field issue + # restart: unless-stopped + # environment: + # - NODE_ENV=production + # depends_on: + # - sv1-node-pool-proxy + # networks: + # sv2-net: + # ipv4_address: 10.5.0.8 + # cap_add: + # - NET_ADMIN + + sv1-ckpool: + container_name: sv1-ckpool labels: - logging: "config-a" + logging: "config-c" build: context: . - dockerfile: ./sv1-public-pool.dockerfile + dockerfile: ./sv1-ckpool.dockerfile ports: - "3332:3332" - - "3334:3334" volumes: - - "./testnet-DB:/public-pool/DB" - - "./custom-configs/sv1-pool/.env:/public-pool/.env:ro" - - "./custom-configs/sv1-pool/rpc.js:/public-pool/node_modules/rpc-bitcoin/build/src/rpc.js" # to fix rpc-version field issue + - "./conf:/ckpool-solo/src/conf" restart: unless-stopped - environment: - - NODE_ENV=production - depends_on: - - sv1-node-pool-proxy networks: sv2-net: - ipv4_address: 10.5.0.8 - cap_add: - - NET_ADMIN + ipv4_address: 10.5.0.40 + healthcheck: + test: ["CMD-SHELL", "curl --silent --user username:password --data-binary '{\"jsonrpc\":\"1.0\",\"id\":\"healthcheck\",\"method\":\"getblockchaininfo\",\"params\":[]}' -H 'Content-Type: application/json' http://10.5.0.16:18332/ | jq -e '.result.initialblockdownload == false' || exit 1"] + interval: 30s + timeout: 10s + retries: 10 + start_period: 10s sv1-pool-miner-proxy: image: sv1-custom-proxy-builder-image @@ -355,14 +377,14 @@ services: - "3333:3333" - "2345:2345" environment: - - SERVER=10.5.0.8:3332 + - SERVER=10.5.0.40:3332 - CLIENT=0.0.0.0:3333 - PROM_ADDRESS=10.5.0.19:2345 - PROXY_TYPE=pool-miner container_name: sv1-pool-miner-proxy depends_on: - sv1-custom-proxy-builder - - sv1-pool + - sv1-ckpool restart: unless-stopped networks: sv2-net: @@ -380,7 +402,7 @@ services: - "4567:4567" environment: - SERVER=http://10.5.0.16:18332 - - CLIENT=0.0.0.0:48330 + - CLIENT=10.5.0.21:18332 - PROM_ADDRESS=10.5.0.21:4567 - PROXY_TYPE=node-pool container_name: sv1-node-pool-proxy diff --git a/docker-compose-config-c.yaml b/docker-compose-config-c.yaml index cd1c210..99d9286 100644 --- a/docker-compose-config-c.yaml +++ b/docker-compose-config-c.yaml @@ -95,6 +95,7 @@ services: - "38333:18333" - "28332:18332" - "18443:18443" + - "8332:8332" container_name: sv1-node-pool-side depends_on: - common-template-provider-builder @@ -115,6 +116,28 @@ services: timeout: 30s retries: 100 start_period: 1m + + sv1-ckpool: + container_name: sv1-ckpool + labels: + logging: "config-c" + build: + context: . + dockerfile: ./sv1-ckpool.dockerfile + ports: + - "3332:3332" + volumes: + - "./conf:/ckpool-solo/src/conf" + restart: unless-stopped + networks: + sv2-net: + ipv4_address: 10.5.0.40 + healthcheck: + test: ["CMD-SHELL", "curl --silent --user username:password --data-binary '{\"jsonrpc\":\"1.0\",\"id\":\"healthcheck\",\"method\":\"getblockchaininfo\",\"params\":[]}' -H 'Content-Type: application/json' http://10.5.0.16:18332/ | jq -e '.result.initialblockdownload == false' || exit 1"] + interval: 30s + timeout: 10s + retries: 10 + start_period: 10s pool: image: sv2-roles-builder-image @@ -245,30 +268,30 @@ services: sv2-net: ipv4_address: 10.5.0.23 - sv1-pool: - container_name: sv1-pool - labels: - logging: "config-c" - build: - context: . - dockerfile: ./sv1-public-pool.dockerfile - ports: - - "3332:3332" - - "3334:3334" - volumes: - - "./testnet-DB:/public-pool/DB" - - "./custom-configs/sv1-pool/.env:/public-pool/.env:ro" - - "./custom-configs/sv1-pool/rpc.js:/public-pool/node_modules/rpc-bitcoin/build/src/rpc.js" # to fix rpc-version field issue - restart: unless-stopped - environment: - - NODE_ENV=production - depends_on: - - sv1-node-pool-proxy - networks: - sv2-net: - ipv4_address: 10.5.0.8 - cap_add: - - NET_ADMIN + # sv1-pool: + # container_name: sv1-pool + # labels: + # logging: "config-c" + # build: + # context: . + # dockerfile: ./sv1-public-pool.dockerfile + # ports: + # - "3332:3332" + # - "3334:3334" + # volumes: + # - "./testnet-DB:/public-pool/DB" + # - "./custom-configs/sv1-pool/.env:/public-pool/.env:ro" + # - "./custom-configs/sv1-pool/rpc.js:/public-pool/node_modules/rpc-bitcoin/build/src/rpc.js" # to fix rpc-version field issue + # restart: unless-stopped + # environment: + # - NODE_ENV=production + # depends_on: + # - sv1-node-pool-proxy + # networks: + # sv2-net: + # ipv4_address: 10.5.0.8 + # cap_add: + # - NET_ADMIN sv1-pool-miner-proxy: image: sv1-custom-proxy-builder-image @@ -284,14 +307,14 @@ services: - "3333:3333" - "2345:2345" environment: - - SERVER=10.5.0.8:3332 + - SERVER=10.5.0.40:3332 - CLIENT=0.0.0.0:3333 - PROM_ADDRESS=10.5.0.19:2345 - PROXY_TYPE=pool-miner container_name: sv1-pool-miner-proxy depends_on: - sv1-custom-proxy-builder - - sv1-pool + - sv1-ckpool restart: unless-stopped networks: sv2-net: @@ -309,7 +332,7 @@ services: - "4567:4567" environment: - SERVER=http://10.5.0.16:18332 - - CLIENT=0.0.0.0:48330 + - CLIENT=10.5.0.21:18332 - PROM_ADDRESS=10.5.0.21:4567 - PROXY_TYPE=node-pool container_name: sv1-node-pool-proxy diff --git a/sv1-ckpool.dockerfile b/sv1-ckpool.dockerfile new file mode 100644 index 0000000..8614325 --- /dev/null +++ b/sv1-ckpool.dockerfile @@ -0,0 +1,21 @@ +FROM ubuntu:latest + + +ARG REPO=ckpool-solo +ARG BRANCH=solobtc +ARG REPO_URL=https://bitbucket.org/ckolivas/${REPO}.git + + +RUN apt-get update && apt-get install -y autoconf automake libtool build-essential git yasm libzmq3-dev libcap2-bin pkgconf + +RUN git clone ${REPO_URL} + +WORKDIR /ckpool-solo + +COPY conf/ckpool.conf . + +RUN ./autogen.sh && ./configure && make + +WORKDIR ./src + +CMD ["./ckpool","-B","-k", "-c", "./conf/ckpool.conf"] From 6d6854b537894bfd7d6998f98d77001a991b027c Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Thu, 17 Oct 2024 14:23:30 +0530 Subject: [PATCH 2/6] add ckproxy --- conf/ckpool.conf | 2 +- conf/ckproxy.conf | 17 +++++ docker-compose-config-a.yaml | 76 +++++++++++++--------- docker-compose-config-c.yaml | 121 ++++++++++++++++++++--------------- sv1-ckproxy.dockerfile | 21 ++++++ 5 files changed, 156 insertions(+), 81 deletions(-) create mode 100644 conf/ckproxy.conf create mode 100644 sv1-ckproxy.dockerfile diff --git a/conf/ckpool.conf b/conf/ckpool.conf index 8569e37..b735908 100644 --- a/conf/ckpool.conf +++ b/conf/ckpool.conf @@ -17,7 +17,7 @@ "10.5.0.40:3332" ], "mindiff": 1, - "startdiff": 42, + "startdiff": 1, "maxdiff": 0, "zmqblock": "tcp://10.5.0.16:28332", "logdir": "logs" diff --git a/conf/ckproxy.conf b/conf/ckproxy.conf new file mode 100644 index 0000000..5775ab0 --- /dev/null +++ b/conf/ckproxy.conf @@ -0,0 +1,17 @@ +{ +"proxy" : [ + { + "url" : "10.5.0.19:3333", + "auth" : "tb1qa0sm0hxzj0x25rh8gw5xlzwlsfvvyz8u96w3p8.sv2-gitgab19", + "pass" : "" + } +], +"update_interval" : 30, +"serverurl" : ["0.0.0.0:3333"], +"mindiff" : 1, +"startdiff" : 1, +"maxdiff" : 0, +"logdir" : "logs" +} + +# ./minerd -a sha256d -o stratum+tcp://127.0.0.1:3333 -q -D -P -u tb1qa0sm0hxzj0x25rh8gw5xlzwlsfvvyz8u96w3p8.sv2-gitgab19 \ No newline at end of file diff --git a/docker-compose-config-a.yaml b/docker-compose-config-a.yaml index edd081d..c076130 100644 --- a/docker-compose-config-a.yaml +++ b/docker-compose-config-a.yaml @@ -316,30 +316,30 @@ services: sv2-net: ipv4_address: 10.5.0.23 - # sv1-pool: - # container_name: sv1-pool - # labels: - # logging: "config-a" - # build: - # context: . - # dockerfile: ./sv1-public-pool.dockerfile - # ports: - # - "3332:3332" - # - "3334:3334" - # volumes: - # - "./testnet-DB:/public-pool/DB" - # - "./custom-configs/sv1-pool/.env:/public-pool/.env:ro" - # - "./custom-configs/sv1-pool/rpc.js:/public-pool/node_modules/rpc-bitcoin/build/src/rpc.js" # to fix rpc-version field issue - # restart: unless-stopped - # environment: - # - NODE_ENV=production - # depends_on: - # - sv1-node-pool-proxy - # networks: - # sv2-net: - # ipv4_address: 10.5.0.8 - # cap_add: - # - NET_ADMIN + sv1-pool: + container_name: sv1-pool + labels: + logging: "config-a" + build: + context: . + dockerfile: ./sv1-public-pool.dockerfile + ports: + - "3332:3332" + - "3334:3334" + volumes: + - "./testnet-DB:/public-pool/DB" + - "./custom-configs/sv1-pool/.env:/public-pool/.env:ro" + - "./custom-configs/sv1-pool/rpc.js:/public-pool/node_modules/rpc-bitcoin/build/src/rpc.js" # to fix rpc-version field issue + restart: unless-stopped + environment: + - NODE_ENV=production + depends_on: + - sv1-node-pool-proxy + networks: + sv2-net: + ipv4_address: 10.5.0.8 + cap_add: + - NET_ADMIN sv1-ckpool: container_name: sv1-ckpool @@ -348,8 +348,8 @@ services: build: context: . dockerfile: ./sv1-ckpool.dockerfile - ports: - - "3332:3332" + # ports: + # - "3332:3332" volumes: - "./conf:/ckpool-solo/src/conf" restart: unless-stopped @@ -362,6 +362,24 @@ services: timeout: 10s retries: 10 start_period: 10s + + sv1-ckproxy: + container_name: sv1-ckproxy + labels: + logging: "config-c" + build: + context: . + dockerfile: ./sv1-ckproxy.dockerfile + ports: + - "3333:3333" + volumes: + - "./conf:/ckpool-solo/src/conf" + restart: unless-stopped + depends_on: + - sv1-pool + networks: + sv2-net: + ipv4_address: 10.5.0.41 sv1-pool-miner-proxy: image: sv1-custom-proxy-builder-image @@ -374,11 +392,11 @@ services: "/usr/local/bin/monitor_and_apply_latency.sh 10.5.0.8 2 & exec ./target/release/sv1-custom-proxy", ] ports: - - "3333:3333" + # - "3333:3333" - "2345:2345" environment: - SERVER=10.5.0.40:3332 - - CLIENT=0.0.0.0:3333 + - CLIENT=10.5.0.19:3333 - PROM_ADDRESS=10.5.0.19:2345 - PROXY_TYPE=pool-miner container_name: sv1-pool-miner-proxy @@ -402,7 +420,7 @@ services: - "4567:4567" environment: - SERVER=http://10.5.0.16:18332 - - CLIENT=10.5.0.21:18332 + - CLIENT=0.0.0.0:48330 - PROM_ADDRESS=10.5.0.21:4567 - PROXY_TYPE=node-pool container_name: sv1-node-pool-proxy diff --git a/docker-compose-config-c.yaml b/docker-compose-config-c.yaml index 99d9286..0df190a 100644 --- a/docker-compose-config-c.yaml +++ b/docker-compose-config-c.yaml @@ -116,28 +116,6 @@ services: timeout: 30s retries: 100 start_period: 1m - - sv1-ckpool: - container_name: sv1-ckpool - labels: - logging: "config-c" - build: - context: . - dockerfile: ./sv1-ckpool.dockerfile - ports: - - "3332:3332" - volumes: - - "./conf:/ckpool-solo/src/conf" - restart: unless-stopped - networks: - sv2-net: - ipv4_address: 10.5.0.40 - healthcheck: - test: ["CMD-SHELL", "curl --silent --user username:password --data-binary '{\"jsonrpc\":\"1.0\",\"id\":\"healthcheck\",\"method\":\"getblockchaininfo\",\"params\":[]}' -H 'Content-Type: application/json' http://10.5.0.16:18332/ | jq -e '.result.initialblockdownload == false' || exit 1"] - interval: 30s - timeout: 10s - retries: 10 - start_period: 10s pool: image: sv2-roles-builder-image @@ -268,30 +246,30 @@ services: sv2-net: ipv4_address: 10.5.0.23 - # sv1-pool: - # container_name: sv1-pool - # labels: - # logging: "config-c" - # build: - # context: . - # dockerfile: ./sv1-public-pool.dockerfile - # ports: - # - "3332:3332" - # - "3334:3334" - # volumes: - # - "./testnet-DB:/public-pool/DB" - # - "./custom-configs/sv1-pool/.env:/public-pool/.env:ro" - # - "./custom-configs/sv1-pool/rpc.js:/public-pool/node_modules/rpc-bitcoin/build/src/rpc.js" # to fix rpc-version field issue - # restart: unless-stopped - # environment: - # - NODE_ENV=production - # depends_on: - # - sv1-node-pool-proxy - # networks: - # sv2-net: - # ipv4_address: 10.5.0.8 - # cap_add: - # - NET_ADMIN + sv1-pool: + container_name: sv1-pool + labels: + logging: "config-c" + build: + context: . + dockerfile: ./sv1-public-pool.dockerfile + ports: + - "3332:3332" + - "3334:3334" + volumes: + - "./testnet-DB:/public-pool/DB" + - "./custom-configs/sv1-pool/.env:/public-pool/.env:ro" + - "./custom-configs/sv1-pool/rpc.js:/public-pool/node_modules/rpc-bitcoin/build/src/rpc.js" # to fix rpc-version field issue + restart: unless-stopped + environment: + - NODE_ENV=production + depends_on: + - sv1-node-pool-proxy + networks: + sv2-net: + ipv4_address: 10.5.0.8 + cap_add: + - NET_ADMIN sv1-pool-miner-proxy: image: sv1-custom-proxy-builder-image @@ -304,17 +282,17 @@ services: "/usr/local/bin/monitor_and_apply_latency.sh 10.5.0.8 2 & exec ./target/release/sv1-custom-proxy", ] ports: - - "3333:3333" + # - "3333:3333" - "2345:2345" environment: - - SERVER=10.5.0.40:3332 - - CLIENT=0.0.0.0:3333 + - SERVER=10.5.0.8:3332 + - CLIENT=10.5.0.19:3333 - PROM_ADDRESS=10.5.0.19:2345 - PROXY_TYPE=pool-miner container_name: sv1-pool-miner-proxy depends_on: - sv1-custom-proxy-builder - - sv1-ckpool + - sv1-pool restart: unless-stopped networks: sv2-net: @@ -332,7 +310,7 @@ services: - "4567:4567" environment: - SERVER=http://10.5.0.16:18332 - - CLIENT=10.5.0.21:18332 + - CLIENT=0.0.0.0:48330 - PROM_ADDRESS=10.5.0.21:4567 - PROXY_TYPE=node-pool container_name: sv1-node-pool-proxy @@ -346,6 +324,47 @@ services: networks: sv2-net: ipv4_address: 10.5.0.21 + + sv1-ckpool: + container_name: sv1-ckpool + labels: + logging: "config-c" + build: + context: . + dockerfile: ./sv1-ckpool.dockerfile + # ports: + # - "3333:3333" + volumes: + - "./conf:/ckpool-solo/src/conf" + restart: unless-stopped + networks: + sv2-net: + ipv4_address: 10.5.0.40 + healthcheck: + test: ["CMD-SHELL", "curl --silent --user username:password --data-binary '{\"jsonrpc\":\"1.0\",\"id\":\"healthcheck\",\"method\":\"getblockchaininfo\",\"params\":[]}' -H 'Content-Type: application/json' http://10.5.0.16:18332/ | jq -e '.result.initialblockdownload == false' || exit 1"] + interval: 30s + timeout: 10s + retries: 10 + start_period: 10s + + + sv1-ckproxy: + container_name: sv1-ckproxy + labels: + logging: "config-c" + build: + context: . + dockerfile: ./sv1-ckproxy.dockerfile + ports: + - "3333:3333" + volumes: + - "./conf:/ckpool-solo/src/conf" + restart: unless-stopped + depends_on: + - sv1-pool + networks: + sv2-net: + ipv4_address: 10.5.0.41 monitor-traffic-tcpdump: image: inzania/network-traffic-metrics:latest diff --git a/sv1-ckproxy.dockerfile b/sv1-ckproxy.dockerfile new file mode 100644 index 0000000..5132bd6 --- /dev/null +++ b/sv1-ckproxy.dockerfile @@ -0,0 +1,21 @@ +FROM ubuntu:latest + + +ARG REPO=ckpool-solo +ARG BRANCH=solobtc +ARG REPO_URL=https://bitbucket.org/ckolivas/${REPO}.git + + +RUN apt-get update && apt-get install -y autoconf automake libtool build-essential git yasm libzmq3-dev libcap2-bin pkgconf + +RUN git clone ${REPO_URL} + +WORKDIR /ckpool-solo + +COPY conf/ckproxy.conf ./src + +RUN ./autogen.sh && ./configure && make + +WORKDIR ./src + +CMD ["./ckpool","-p","-k", "-c", "./ckproxy.conf"] From 8db55e422823e872f8def1a3f5eb4899ddb2409e Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Sat, 19 Oct 2024 21:48:58 +0530 Subject: [PATCH 3/6] change max diff to 1 --- conf/ckpool.conf | 2 +- conf/ckproxy.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/ckpool.conf b/conf/ckpool.conf index b735908..f5b8ff1 100644 --- a/conf/ckpool.conf +++ b/conf/ckpool.conf @@ -18,7 +18,7 @@ ], "mindiff": 1, "startdiff": 1, - "maxdiff": 0, + "maxdiff": 1, "zmqblock": "tcp://10.5.0.16:28332", "logdir": "logs" } diff --git a/conf/ckproxy.conf b/conf/ckproxy.conf index 5775ab0..ebea959 100644 --- a/conf/ckproxy.conf +++ b/conf/ckproxy.conf @@ -10,7 +10,7 @@ "serverurl" : ["0.0.0.0:3333"], "mindiff" : 1, "startdiff" : 1, -"maxdiff" : 0, +"maxdiff" : 1, "logdir" : "logs" } From 3d38b6c2ec5c3cecdc552704bfd5e640fb99bba9 Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Tue, 26 Nov 2024 09:05:07 +0530 Subject: [PATCH 4/6] change to a commit --- conf/ckproxy.conf | 10 +- docker-compose-config-c.yaml | 726 +++++++++++++++++------------------ sv1-ckproxy.dockerfile | 33 +- 3 files changed, 396 insertions(+), 373 deletions(-) diff --git a/conf/ckproxy.conf b/conf/ckproxy.conf index ebea959..bab1e22 100644 --- a/conf/ckproxy.conf +++ b/conf/ckproxy.conf @@ -8,10 +8,12 @@ ], "update_interval" : 30, "serverurl" : ["0.0.0.0:3333"], -"mindiff" : 1, -"startdiff" : 1, -"maxdiff" : 1, -"logdir" : "logs" +"mindiff": 0.01, +"startdiff": 0.1, +"maxdiff": 100.01, +"zmqblock": "tcp://10.5.0.16:28332", +"logdir": "logs", +"spm": 10 } # ./minerd -a sha256d -o stratum+tcp://127.0.0.1:3333 -q -D -P -u tb1qa0sm0hxzj0x25rh8gw5xlzwlsfvvyz8u96w3p8.sv2-gitgab19 \ No newline at end of file diff --git a/docker-compose-config-c.yaml b/docker-compose-config-c.yaml index 0df190a..250c0cf 100644 --- a/docker-compose-config-c.yaml +++ b/docker-compose-config-c.yaml @@ -22,19 +22,19 @@ services: image: template-provider-builder-image command: echo "common-template-provider build completed" - sv2-roles-builder: - build: - dockerfile: ./sv2-roles.dockerfile - container_name: sv2-roles-builder - image: sv2-roles-builder-image - command: echo "SRI build completed" + # sv2-roles-builder: + # build: + # dockerfile: ./sv2-roles.dockerfile + # container_name: sv2-roles-builder + # image: sv2-roles-builder-image + # command: echo "SRI build completed" - sv2-custom-proxy-builder: - build: - dockerfile: ./sv2-custom-proxy/Dockerfile - container_name: sv2-custom-proxy-builder - image: sv2-custom-proxy-builder-image - command: echo "sv2-custom-proxy build completed" + # sv2-custom-proxy-builder: + # build: + # dockerfile: ./sv2-custom-proxy/Dockerfile + # container_name: sv2-custom-proxy-builder + # image: sv2-custom-proxy-builder-image + # command: echo "sv2-custom-proxy build completed" sv1-custom-proxy-builder: build: @@ -43,48 +43,48 @@ services: image: sv1-custom-proxy-builder-image command: echo "sv1-custom-proxy build completed" - log-server-builder: - build: - dockerfile: ./log-server/Dockerfile - container_name: log-server-builder - image: log-server-builder-image - command: echo "log-server-builder build completed" + # log-server-builder: + # build: + # dockerfile: ./log-server/Dockerfile + # container_name: log-server-builder + # image: log-server-builder-image + # command: echo "log-server-builder build completed" - pools-latency-calculator-builder: - build: - dockerfile: pools-latency-calculator.dockerfile - container_name: pools-latency-calculator-builder - image: pools-latency-calculator-builder-image - command: echo "pools-latency-calculator build completed" + # pools-latency-calculator-builder: + # build: + # dockerfile: pools-latency-calculator.dockerfile + # container_name: pools-latency-calculator-builder + # image: pools-latency-calculator-builder-image + # command: echo "pools-latency-calculator build completed" - template-provider-pool-side: - labels: - logging: "config-c" - image: template-provider-builder-image - entrypoint: ["/bin/sh", "-c", "./scripts/update-mainnet-chainstate.sh ${NETWORK} && /bitcoin/bin/bitcoind -sv2 -sv2port=8442 -sv2interval=${SV2_INTERVAL} -sv2feedelta=0 -debug=sv2 -loglevel=sv2:trace -sv2bind=0.0.0.0 -${NETWORK}"] - ports: - - "8442:8442" - - "18333:48333" - - "8332:8332" - - "18332:18332" - container_name: sv2-tp-pool-side - depends_on: - - common-template-provider-builder - volumes: - - bitcoin_pool_side_data:/root/.bitcoin - - shared-mainnet-snapshot-volume:/shared_volume # Shared volume for mainnet snapshot - - ./custom-configs/sri-roles/bitcoin-tp-pool.conf:/root/.bitcoin/bitcoin.conf - - ./containers-scripts:/scripts - restart: unless-stopped - networks: - sv2-net: - ipv4_address: 10.5.0.2 - healthcheck: - test: [ "CMD", "./scripts/healthcheck.sh", "http://127.0.0.1:18332" ] - interval: 2m - timeout: 30s - retries: 100 - start_period: 1m + # template-provider-pool-side: + # labels: + # logging: "config-c" + # image: template-provider-builder-image + # entrypoint: ["/bin/sh", "-c", "./scripts/update-mainnet-chainstate.sh ${NETWORK} && /bitcoin/bin/bitcoind -sv2 -sv2port=8442 -sv2interval=${SV2_INTERVAL} -sv2feedelta=0 -debug=sv2 -loglevel=sv2:trace -sv2bind=0.0.0.0 -${NETWORK}"] + # ports: + # - "8442:8442" + # - "18333:48333" + # - "8332:8332" + # - "18332:18332" + # container_name: sv2-tp-pool-side + # depends_on: + # - common-template-provider-builder + # volumes: + # - bitcoin_pool_side_data:/root/.bitcoin + # - shared-mainnet-snapshot-volume:/shared_volume # Shared volume for mainnet snapshot + # - ./custom-configs/sri-roles/bitcoin-tp-pool.conf:/root/.bitcoin/bitcoin.conf + # - ./containers-scripts:/scripts + # restart: unless-stopped + # networks: + # sv2-net: + # ipv4_address: 10.5.0.2 + # healthcheck: + # test: [ "CMD", "./scripts/healthcheck.sh", "http://127.0.0.1:18332" ] + # interval: 2m + # timeout: 30s + # retries: 100 + # start_period: 1m sv1-node-pool-side: labels: @@ -117,134 +117,134 @@ services: retries: 100 start_period: 1m - pool: - image: sv2-roles-builder-image - labels: - logging: "config-c" - command: - [ - "./target/release/pool_sv2", - "-c", - "pool/config-examples/pool-config-c-docker-example.toml", - ] - ports: - - "34254:34254" - container_name: sv2-pool - depends_on: - - sv2-roles-builder - - sv2-tp-pool-proxy - volumes: - - ./custom-configs/sri-roles/config-c:/usr/src/stratum/roles/pool/config-examples/ - restart: unless-stopped - networks: - sv2-net: - ipv4_address: 10.5.0.4 - cap_add: - - NET_ADMIN + # pool: + # image: sv2-roles-builder-image + # labels: + # logging: "config-c" + # command: + # [ + # "./target/release/pool_sv2", + # "-c", + # "pool/config-examples/pool-config-c-docker-example.toml", + # ] + # ports: + # - "34254:34254" + # container_name: sv2-pool + # depends_on: + # - sv2-roles-builder + # - sv2-tp-pool-proxy + # volumes: + # - ./custom-configs/sri-roles/config-c:/usr/src/stratum/roles/pool/config-examples/ + # restart: unless-stopped + # networks: + # sv2-net: + # ipv4_address: 10.5.0.4 + # cap_add: + # - NET_ADMIN - translator: - image: sv2-roles-builder-image - labels: - logging: "config-c" - command: - [ - "/bin/bash", - "-c", - "/usr/local/bin/monitor_and_apply_latency.sh 10.5.0.23 2 & exec ./target/release/translator_sv2 -c translator/config-examples/tproxy-config-c-docker-example.toml", - ] - ports: - - "34256:34256" - container_name: sv2-translator - depends_on: - - sv2-pool-translator-proxy - volumes: - - ./custom-configs/sri-roles/config-c:/usr/src/stratum/roles/translator/config-examples/ - restart: unless-stopped - networks: - sv2-net: - ipv4_address: 10.5.0.7 - cap_add: - - NET_ADMIN + # translator: + # image: sv2-roles-builder-image + # labels: + # logging: "config-c" + # command: + # [ + # "/bin/bash", + # "-c", + # "/usr/local/bin/monitor_and_apply_latency.sh 10.5.0.23 2 & exec ./target/release/translator_sv2 -c translator/config-examples/tproxy-config-c-docker-example.toml", + # ] + # ports: + # - "34256:34256" + # container_name: sv2-translator + # depends_on: + # - sv2-pool-translator-proxy + # volumes: + # - ./custom-configs/sri-roles/config-c:/usr/src/stratum/roles/translator/config-examples/ + # restart: unless-stopped + # networks: + # sv2-net: + # ipv4_address: 10.5.0.7 + # cap_add: + # - NET_ADMIN - sv2-pool-translator-proxy: - image: sv2-custom-proxy-builder-image - labels: - logging: "config-c" - command: - [ - "/bin/bash", - "-c", - "/usr/local/bin/monitor_and_apply_latency.sh 10.5.0.4 2 -proxy-type=pool-translator & exec ./target/release/sv2-custom-proxy", - ] - ports: - - "34253:34254" - - "34251:34251" - - "3456:3456" - environment: - - SERVER=10.5.0.4:34254 - - CLIENT=10.5.0.17:34251 - - PROM_ADDRESS=10.5.0.17:3456 - - PROXY_TYPE=pool-translator - container_name: sv2-pool-translator-proxy - depends_on: - - sv2-custom-proxy-builder - - pool - restart: unless-stopped - networks: - sv2-net: - ipv4_address: 10.5.0.17 - cap_add: - - NET_ADMIN + # sv2-pool-translator-proxy: + # image: sv2-custom-proxy-builder-image + # labels: + # logging: "config-c" + # command: + # [ + # "/bin/bash", + # "-c", + # "/usr/local/bin/monitor_and_apply_latency.sh 10.5.0.4 2 -proxy-type=pool-translator & exec ./target/release/sv2-custom-proxy", + # ] + # ports: + # - "34253:34254" + # - "34251:34251" + # - "3456:3456" + # environment: + # - SERVER=10.5.0.4:34254 + # - CLIENT=10.5.0.17:34251 + # - PROM_ADDRESS=10.5.0.17:3456 + # - PROXY_TYPE=pool-translator + # container_name: sv2-pool-translator-proxy + # depends_on: + # - sv2-custom-proxy-builder + # - pool + # restart: unless-stopped + # networks: + # sv2-net: + # ipv4_address: 10.5.0.17 + # cap_add: + # - NET_ADMIN - sv2-tp-pool-proxy: - image: sv2-custom-proxy-builder-image - labels: - logging: "config-c" - command: ["./target/release/sv2-custom-proxy"] - ports: - - "8441:8441" - - "5678:5678" - environment: - - SERVER=10.5.0.2:8442 - - CLIENT=10.5.0.20:8441 - - PROM_ADDRESS=10.5.0.20:5678 - - PROXY_TYPE=tp-pool - - NETWORK=${NETWORK} - container_name: sv2-tp-pool-proxy - depends_on: - template-provider-pool-side: - condition: service_healthy - restart: true - sv2-custom-proxy-builder: - condition: service_started - prometheus: - condition: service_started - restart: unless-stopped - networks: - sv2-net: - ipv4_address: 10.5.0.20 + # sv2-tp-pool-proxy: + # image: sv2-custom-proxy-builder-image + # labels: + # logging: "config-c" + # command: ["./target/release/sv2-custom-proxy"] + # ports: + # - "8441:8441" + # - "5678:5678" + # environment: + # - SERVER=10.5.0.2:8442 + # - CLIENT=10.5.0.20:8441 + # - PROM_ADDRESS=10.5.0.20:5678 + # - PROXY_TYPE=tp-pool + # - NETWORK=${NETWORK} + # container_name: sv2-tp-pool-proxy + # depends_on: + # template-provider-pool-side: + # condition: service_healthy + # restart: true + # sv2-custom-proxy-builder: + # condition: service_started + # prometheus: + # condition: service_started + # restart: unless-stopped + # networks: + # sv2-net: + # ipv4_address: 10.5.0.20 - sv2-translator-miner-proxy: - image: sv1-custom-proxy-builder-image - labels: - logging: "config-c" - command: ["./target/release/sv1-custom-proxy"] - ports: - - "34255:34255" - - "5676:5676" - environment: - - SERVER=0.0.0.0:34255 - - CLIENT=10.5.0.7:34256 - - PROM_ADDRESS=10.5.0.23:5676 - - PROXY_TYPE=translator-miner - container_name: sv2-translator-miner-proxy - depends_on: - - sv1-custom-proxy-builder - - translator - restart: unless-stopped - networks: - sv2-net: - ipv4_address: 10.5.0.23 + # sv2-translator-miner-proxy: + # image: sv1-custom-proxy-builder-image + # labels: + # logging: "config-c" + # command: ["./target/release/sv1-custom-proxy"] + # ports: + # - "34255:34255" + # - "5676:5676" + # environment: + # - SERVER=0.0.0.0:34255 + # - CLIENT=10.5.0.7:34256 + # - PROM_ADDRESS=10.5.0.23:5676 + # - PROXY_TYPE=translator-miner + # container_name: sv2-translator-miner-proxy + # depends_on: + # - sv1-custom-proxy-builder + # - translator + # restart: unless-stopped + # networks: + # sv2-net: + # ipv4_address: 10.5.0.23 sv1-pool: container_name: sv1-pool @@ -366,200 +366,200 @@ services: sv2-net: ipv4_address: 10.5.0.41 - monitor-traffic-tcpdump: - image: inzania/network-traffic-metrics:latest - network_mode: host - container_name: monitor-traffic-tcpdump - platform: linux/amd64 - environment: - - "NTM_INTERFACE=any" - - "NTM_FILTERS=" + # monitor-traffic-tcpdump: + # image: inzania/network-traffic-metrics:latest + # network_mode: host + # container_name: monitor-traffic-tcpdump + # platform: linux/amd64 + # environment: + # - "NTM_INTERFACE=any" + # - "NTM_FILTERS=" - prometheus: - image: prom/prometheus:v2.36.2 - volumes: - - ./prometheus/:/etc/prometheus/ - - prometheus_data_config_c:/prometheus - command: - - "--config.file=/etc/prometheus/prometheus.yml" - - "--storage.tsdb.path=/prometheus" - - "--web.console.libraries=/usr/share/prometheus/console_libraries" - - "--web.console.templates=/usr/share/prometheus/consoles" - - "--web.enable-lifecycle" - - "--web.enable-admin-api" - ports: - - "9090:9090" - container_name: prometheus - depends_on: - - cadvisor - networks: - sv2-net: - ipv4_address: 10.5.0.9 - deploy: - placement: - constraints: - - node.role==manager - restart_policy: - condition: on-failure - extra_hosts: - - "host.docker.internal:10.5.0.1" + # prometheus: + # image: prom/prometheus:v2.36.2 + # volumes: + # - ./prometheus/:/etc/prometheus/ + # - prometheus_data_config_c:/prometheus + # command: + # - "--config.file=/etc/prometheus/prometheus.yml" + # - "--storage.tsdb.path=/prometheus" + # - "--web.console.libraries=/usr/share/prometheus/console_libraries" + # - "--web.console.templates=/usr/share/prometheus/consoles" + # - "--web.enable-lifecycle" + # - "--web.enable-admin-api" + # ports: + # - "9090:9090" + # container_name: prometheus + # depends_on: + # - cadvisor + # networks: + # sv2-net: + # ipv4_address: 10.5.0.9 + # deploy: + # placement: + # constraints: + # - node.role==manager + # restart_policy: + # condition: on-failure + # extra_hosts: + # - "host.docker.internal:10.5.0.1" - node-exporter: - image: quay.io/prometheus/node-exporter:latest - volumes: - - /proc:/host/proc:ro - - /sys:/host/sys:ro - - /:/rootfs:ro - command: - - "--path.procfs=/host/proc" - - "--path.sysfs=/host/sys" - - --collector.filesystem.ignored-mount-points - - "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)" - ports: - - "9100:9100" - container_name: node-exporter - networks: - sv2-net: - ipv4_address: 10.5.0.10 - deploy: - mode: global - restart_policy: - condition: on-failure + # node-exporter: + # image: quay.io/prometheus/node-exporter:latest + # volumes: + # - /proc:/host/proc:ro + # - /sys:/host/sys:ro + # - /:/rootfs:ro + # command: + # - "--path.procfs=/host/proc" + # - "--path.sysfs=/host/sys" + # - --collector.filesystem.ignored-mount-points + # - "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)" + # ports: + # - "9100:9100" + # container_name: node-exporter + # networks: + # sv2-net: + # ipv4_address: 10.5.0.10 + # deploy: + # mode: global + # restart_policy: + # condition: on-failure - cadvisor: - image: gcr.io/cadvisor/cadvisor - volumes: - - /:/rootfs:ro - #- /var/run:/var/run:rw - - /var/run/docker.sock:/var/run/docker.sock:rw - - /sys:/sys:ro - - /var/lib/docker/:/var/lib/docker:ro - ports: - - "8080:8080" - container_name: cadvisor - networks: - sv2-net: - ipv4_address: 10.5.0.12 - deploy: - mode: global - restart_policy: - condition: on-failure + # cadvisor: + # image: gcr.io/cadvisor/cadvisor + # volumes: + # - /:/rootfs:ro + # #- /var/run:/var/run:rw + # - /var/run/docker.sock:/var/run/docker.sock:rw + # - /sys:/sys:ro + # - /var/lib/docker/:/var/lib/docker:ro + # ports: + # - "8080:8080" + # container_name: cadvisor + # networks: + # sv2-net: + # ipv4_address: 10.5.0.12 + # deploy: + # mode: global + # restart_policy: + # condition: on-failure - grafana: - image: grafana/grafana - depends_on: - - prometheus - - loki - ports: - - "3000:3000" - environment: - GF_USERS_ALLOW_SIGN_UP: "false" - GF_AUTH_DISABLE_LOGIN_FORM: "true" - GF_AUTH_DISABLE_SIGNOUT_MENU: "true" - GF_AUTH_ANONYMOUS_ENABLED: "true" - GF_AUTH_ANONYMOUS_ORG_ROLE: "Admin" - GF_RENDERING_SERVER_URL: http://renderer:8081/render - GF_RENDERING_CALLBACK_URL: http://grafana:3000/ - GF_LOG_FILTERS: rendering:debug - container_name: grafana - volumes: - - grafana_data_config_c:/var/lib/grafana - - ./grafana/provisioning/dashboards/config-c:/etc/grafana/provisioning/dashboards - - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources - env_file: - - ./grafana/config.monitoring - networks: - sv2-net: - ipv4_address: 10.5.0.13 - user: "472" - deploy: - placement: - constraints: - - node.role==manager - restart_policy: - condition: on-failure + # grafana: + # image: grafana/grafana + # depends_on: + # - prometheus + # - loki + # ports: + # - "3000:3000" + # environment: + # GF_USERS_ALLOW_SIGN_UP: "false" + # GF_AUTH_DISABLE_LOGIN_FORM: "true" + # GF_AUTH_DISABLE_SIGNOUT_MENU: "true" + # GF_AUTH_ANONYMOUS_ENABLED: "true" + # GF_AUTH_ANONYMOUS_ORG_ROLE: "Admin" + # GF_RENDERING_SERVER_URL: http://renderer:8081/render + # GF_RENDERING_CALLBACK_URL: http://grafana:3000/ + # GF_LOG_FILTERS: rendering:debug + # container_name: grafana + # volumes: + # - grafana_data_config_c:/var/lib/grafana + # - ./grafana/provisioning/dashboards/config-c:/etc/grafana/provisioning/dashboards + # - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources + # env_file: + # - ./grafana/config.monitoring + # networks: + # sv2-net: + # ipv4_address: 10.5.0.13 + # user: "472" + # deploy: + # placement: + # constraints: + # - node.role==manager + # restart_policy: + # condition: on-failure - reporter: - image: izakmarais/grafana-reporter:${gr_version:-latest} - command: "-ip grafana:3000 -grid-layout=1" - container_name: reporter - platform: linux/amd64 - depends_on: - - grafana - ports: - - "8686:8686" - networks: - sv2-net: - ipv4_address: 10.5.0.14 + # reporter: + # image: izakmarais/grafana-reporter:${gr_version:-latest} + # command: "-ip grafana:3000 -grid-layout=1" + # container_name: reporter + # platform: linux/amd64 + # depends_on: + # - grafana + # ports: + # - "8686:8686" + # networks: + # sv2-net: + # ipv4_address: 10.5.0.14 - renderer: - image: grafana/grafana-image-renderer:latest - container_name: renderer - depends_on: - - grafana - ports: - - "8081:8081" - networks: - sv2-net: - ipv4_address: 10.5.0.15 + # renderer: + # image: grafana/grafana-image-renderer:latest + # container_name: renderer + # depends_on: + # - grafana + # ports: + # - "8081:8081" + # networks: + # sv2-net: + # ipv4_address: 10.5.0.15 - pools-latency-calculator: - image: pools-latency-calculator-builder-image - command: ["./target/release/pools-latency-calculator"] - ports: - - "1234:1234" - container_name: pools-latency-calculator - restart: unless-stopped - networks: - sv2-net: - ipv4_address: 10.5.0.18 + # pools-latency-calculator: + # image: pools-latency-calculator-builder-image + # command: ["./target/release/pools-latency-calculator"] + # ports: + # - "1234:1234" + # container_name: pools-latency-calculator + # restart: unless-stopped + # networks: + # sv2-net: + # ipv4_address: 10.5.0.18 - loki: - image: grafana/loki - container_name: loki - ports: - - "3100:3100" - restart: unless-stopped - networks: - sv2-net: - ipv4_address: 10.5.0.30 - aliases: - - loki - volumes: - - ./loki-config.yaml:/etc/loki/loki-config.yaml - command: -config.file=/etc/loki/loki-config.yaml + # loki: + # image: grafana/loki + # container_name: loki + # ports: + # - "3100:3100" + # restart: unless-stopped + # networks: + # sv2-net: + # ipv4_address: 10.5.0.30 + # aliases: + # - loki + # volumes: + # - ./loki-config.yaml:/etc/loki/loki-config.yaml + # command: -config.file=/etc/loki/loki-config.yaml - promtail: - image: grafana/promtail - container_name: promtail - volumes: - - ./promtail/config/config-c/promtail-local-config.yaml:/etc/promtail/config.yaml - - /var/lib/docker/containers:/var/lib/docker/containers - - /var/run/docker.sock:/var/run/docker.sock - command: -config.file=/etc/promtail/config.yaml - restart: unless-stopped - depends_on: - - loki - networks: - sv2-net: - ipv4_address: 10.5.0.31 - aliases: - - promtail + # promtail: + # image: grafana/promtail + # container_name: promtail + # volumes: + # - ./promtail/config/config-c/promtail-local-config.yaml:/etc/promtail/config.yaml + # - /var/lib/docker/containers:/var/lib/docker/containers + # - /var/run/docker.sock:/var/run/docker.sock + # command: -config.file=/etc/promtail/config.yaml + # restart: unless-stopped + # depends_on: + # - loki + # networks: + # sv2-net: + # ipv4_address: 10.5.0.31 + # aliases: + # - promtail - log-server: - image: log-server-builder-image - command: ["./target/release/log-server"] - volumes: - - /var/run/docker.sock:/var/run/docker.sock - ports: - - "7420:7420" - environment: - - LOG_LABEL=config-c - - RUST_LOG=info - container_name: log-server - depends_on: - - log-server-builder - restart: unless-stopped - networks: - sv2-net: - ipv4_address: 10.5.0.32 \ No newline at end of file + # log-server: + # image: log-server-builder-image + # command: ["./target/release/log-server"] + # volumes: + # - /var/run/docker.sock:/var/run/docker.sock + # ports: + # - "7420:7420" + # environment: + # - LOG_LABEL=config-c + # - RUST_LOG=info + # container_name: log-server + # depends_on: + # - log-server-builder + # restart: unless-stopped + # networks: + # sv2-net: + # ipv4_address: 10.5.0.32 \ No newline at end of file diff --git a/sv1-ckproxy.dockerfile b/sv1-ckproxy.dockerfile index 5132bd6..b73887f 100644 --- a/sv1-ckproxy.dockerfile +++ b/sv1-ckproxy.dockerfile @@ -1,16 +1,36 @@ -FROM ubuntu:latest +# FROM ubuntu:latest + + +# ARG REPO=ckpool-solo +# ARG BRANCH=solobtc +# ARG REPO_URL=https://bitbucket.org/ckolivas/${REPO}.git + + +# RUN apt-get update && apt-get install -y autoconf automake libtool build-essential git yasm libzmq3-dev libcap2-bin pkgconf + +# RUN git clone ${REPO_URL} +# WORKDIR /ckpool-solo -ARG REPO=ckpool-solo -ARG BRANCH=solobtc -ARG REPO_URL=https://bitbucket.org/ckolivas/${REPO}.git +# COPY conf/ckproxy.conf ./src +# RUN ./autogen.sh && ./configure && make + +# WORKDIR ./src + +# CMD ["./ckpool","-p","-k", "-c", "./ckproxy.conf"] + +FROM ubuntu:latest RUN apt-get update && apt-get install -y autoconf automake libtool build-essential git yasm libzmq3-dev libcap2-bin pkgconf +ARG REPO_URL=https://github.com/Shourya742/Pool.git + RUN git clone ${REPO_URL} -WORKDIR /ckpool-solo +WORKDIR /Pool + +RUN git reset 1a0b3143564d3e45edf8679ff344aac92bff7f25 --hard COPY conf/ckproxy.conf ./src @@ -18,4 +38,5 @@ RUN ./autogen.sh && ./configure && make WORKDIR ./src -CMD ["./ckpool","-p","-k", "-c", "./ckproxy.conf"] +CMD ["./ckpool","-p","-k", "-c", "./ckproxy.conf", "-l", "7"] +# CMD ["./ckpool","-B","-k", "-c", "./ckpool.conf", "-l", "7"] From 76c56167a64923eaf0c2990af01d5201e537dca1 Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Wed, 27 Nov 2024 11:15:03 +0530 Subject: [PATCH 5/6] current-state --- conf/ckproxy.conf | 6 +++--- docker-compose-config-c.yaml | 42 ++++++++++++++++++------------------ sv1-ckproxy.dockerfile | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/conf/ckproxy.conf b/conf/ckproxy.conf index bab1e22..3190d59 100644 --- a/conf/ckproxy.conf +++ b/conf/ckproxy.conf @@ -8,9 +8,9 @@ ], "update_interval" : 30, "serverurl" : ["0.0.0.0:3333"], -"mindiff": 0.01, -"startdiff": 0.1, -"maxdiff": 100.01, +"mindiff": 0.000001, +"startdiff": 10000.01, +"maxdiff": 10000.01, "zmqblock": "tcp://10.5.0.16:28332", "logdir": "logs", "spm": 10 diff --git a/docker-compose-config-c.yaml b/docker-compose-config-c.yaml index 250c0cf..2b62882 100644 --- a/docker-compose-config-c.yaml +++ b/docker-compose-config-c.yaml @@ -325,27 +325,27 @@ services: sv2-net: ipv4_address: 10.5.0.21 - sv1-ckpool: - container_name: sv1-ckpool - labels: - logging: "config-c" - build: - context: . - dockerfile: ./sv1-ckpool.dockerfile - # ports: - # - "3333:3333" - volumes: - - "./conf:/ckpool-solo/src/conf" - restart: unless-stopped - networks: - sv2-net: - ipv4_address: 10.5.0.40 - healthcheck: - test: ["CMD-SHELL", "curl --silent --user username:password --data-binary '{\"jsonrpc\":\"1.0\",\"id\":\"healthcheck\",\"method\":\"getblockchaininfo\",\"params\":[]}' -H 'Content-Type: application/json' http://10.5.0.16:18332/ | jq -e '.result.initialblockdownload == false' || exit 1"] - interval: 30s - timeout: 10s - retries: 10 - start_period: 10s + # sv1-ckpool: + # container_name: sv1-ckpool + # labels: + # logging: "config-c" + # build: + # context: . + # dockerfile: ./sv1-ckpool.dockerfile + # # ports: + # # - "3333:3333" + # volumes: + # - "./conf:/ckpool-solo/src/conf" + # restart: unless-stopped + # networks: + # sv2-net: + # ipv4_address: 10.5.0.40 + # healthcheck: + # test: ["CMD-SHELL", "curl --silent --user username:password --data-binary '{\"jsonrpc\":\"1.0\",\"id\":\"healthcheck\",\"method\":\"getblockchaininfo\",\"params\":[]}' -H 'Content-Type: application/json' http://10.5.0.16:18332/ | jq -e '.result.initialblockdownload == false' || exit 1"] + # interval: 30s + # timeout: 10s + # retries: 10 + # start_period: 10s sv1-ckproxy: diff --git a/sv1-ckproxy.dockerfile b/sv1-ckproxy.dockerfile index b73887f..f0e2e18 100644 --- a/sv1-ckproxy.dockerfile +++ b/sv1-ckproxy.dockerfile @@ -30,7 +30,7 @@ RUN git clone ${REPO_URL} WORKDIR /Pool -RUN git reset 1a0b3143564d3e45edf8679ff344aac92bff7f25 --hard +RUN git checkout before_spm COPY conf/ckproxy.conf ./src From 99bbbbdfb8e2315413dde019dd32ef50aa3cf912 Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Fri, 13 Dec 2024 17:01:41 +0530 Subject: [PATCH 6/6] changes for ckproxy --- docker-compose-config-c.yaml | 3 +- .../monitor_and_apply_latency.sh | 2 +- sv1-ckproxy.dockerfile | 4 +-- sv1-custom-proxy/src/main.rs | 28 +++++++++---------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/docker-compose-config-c.yaml b/docker-compose-config-c.yaml index 2b62882..e8c08c8 100644 --- a/docker-compose-config-c.yaml +++ b/docker-compose-config-c.yaml @@ -358,7 +358,8 @@ services: ports: - "3333:3333" volumes: - - "./conf:/ckpool-solo/src/conf" + # - "../ckpool:/Pool" + - "./conf:/Pool/src/conf" restart: unless-stopped depends_on: - sv1-pool diff --git a/pools-latency-calculator/monitor_and_apply_latency.sh b/pools-latency-calculator/monitor_and_apply_latency.sh index cc61cd5..0e71cdc 100755 --- a/pools-latency-calculator/monitor_and_apply_latency.sh +++ b/pools-latency-calculator/monitor_and_apply_latency.sh @@ -31,7 +31,7 @@ while true; do LATENCY=$(echo "$JSON" | grep -o '"value":[[0-9.]*,"[0-9.]*' | cut -d',' -f2 | tr -d '"') # Check if LATENCY is empty if [ -z "$LATENCY" ]; then - echo "No latency value found, skipping this cycle." + echo "" else # Compare the current latency with the previous latency if [ "$LATENCY" != "$PREV_LATENCY" ]; then diff --git a/sv1-ckproxy.dockerfile b/sv1-ckproxy.dockerfile index f0e2e18..6fa4466 100644 --- a/sv1-ckproxy.dockerfile +++ b/sv1-ckproxy.dockerfile @@ -32,11 +32,11 @@ WORKDIR /Pool RUN git checkout before_spm -COPY conf/ckproxy.conf ./src +# COPY conf/ckproxy.conf ./src RUN ./autogen.sh && ./configure && make WORKDIR ./src -CMD ["./ckpool","-p","-k", "-c", "./ckproxy.conf", "-l", "7"] +CMD ["./ckpool","-p","-k", "-c", "./conf/ckproxy.conf", "-l", "7"] # CMD ["./ckpool","-B","-k", "-c", "./ckpool.conf", "-l", "7"] diff --git a/sv1-custom-proxy/src/main.rs b/sv1-custom-proxy/src/main.rs index 3f0763e..c806a9f 100644 --- a/sv1-custom-proxy/src/main.rs +++ b/sv1-custom-proxy/src/main.rs @@ -65,10 +65,10 @@ async fn transfer( .remove_label_values(&[&nonce_string]); }); } else { - println!("Nonce not found in params"); + // println!("Nonce not found in params"); } } else { - println!("Params is not an array"); + // println!("Params is not an array"); } } } else { @@ -107,7 +107,7 @@ async fn transfer( if let Ok(response) = client.get(prometheus_url).send().await { if let Ok(body) = response.text().await { for line in body.lines() { - println!("Line: {:?}", line); + // println!("Line: {:?}", line); if let Some(start_index) = line.find("flag=") { let start = start_index + "flag=\"".len(); if let Some(value) = line.chars().nth(start) { @@ -115,10 +115,10 @@ async fn transfer( if let Some((_, timestamp)) = line.rsplit_once(' ') { - println!( - "The extracted timestamp is: {}", - timestamp.trim() - ); + // println!( + // "The extracted timestamp is: {}", + // timestamp.trim() + // ); let new_job_timestamp = timestamp .trim() .parse::() @@ -128,15 +128,15 @@ async fn transfer( new_job_prev_hash_gauge.set(delta); new_job_gauge.set(delta); } else { - println!("No timestamp value found."); + // println!("No timestamp value found."); } } else if let Some((_, timestamp)) = line.rsplit_once(' ') { - println!( - "The extracted timestamp is: {}", - timestamp.trim() - ); + // println!( + // "The extracted timestamp is: {}", + // timestamp.trim() + // ); let new_job_timestamp = timestamp .trim() .parse::() @@ -145,7 +145,7 @@ async fn transfer( current_timestamp - new_job_timestamp; new_job_gauge.set(delta); } else { - println!("No timestamp value found."); + // println!("No timestamp value found."); } } } @@ -153,7 +153,7 @@ async fn transfer( } } } else { - println!("Prevhash not found in params"); + // println!("Prevhash not found in params"); } } }