From 6b595094668a06c00521628054dd6c50e02b19c1 Mon Sep 17 00:00:00 2001 From: Scott Terry Date: Tue, 28 Nov 2023 10:26:55 -0800 Subject: [PATCH 1/3] move proxy router cmd args to env variables --- public/main/client/proxyRouter.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/public/main/client/proxyRouter.js b/public/main/client/proxyRouter.js index 3f81afcc..79a45a33 100644 --- a/public/main/client/proxyRouter.js +++ b/public/main/client/proxyRouter.js @@ -51,18 +51,18 @@ const runProxyRouter = (config) => { `--contract-address=${config.cloneFactoryAddress}`, `--eth-node-address=${config.wsApiUrl}`, - "--miner-share-timeout=10m", - - "--hashrate-error-threshold=0.05", - "--hashrate-cycle-duration=5m", - "--hashrate-share-timeout=7m", - "--hashrate-validation-start-timeout=15m", - "--hashrate-validation-grace-duration=50m", - - "--log-level-app=info", - "--log-level-scheduler=info", - "--log-level-proxy=info", - "--log-level-connection=info", + `--miner-share-timeout=${process.env.MINER_SHARE_TIMEOUT}`, + + `--hashrate-error-threshold=${process.env.HASHRATE_ERROR_THRESHOLD}`, + `--hashrate-cycle-duration=${process.env.HASHRATE_CYCLE_DURATION}`, + `--hashrate-share-timeout=${process.env.HASHRATE_SHARE_TIMEOUT}`, + `--hashrate-validation-start-timeout=${process.env.HASHRATE_VALIDATION_START_TIMEOUT}`, + `--hashrate-validation-grace-duration=${process.env.HASHRATE_VALIDATION_GRACE_DURATION}`, + + `--log-level-app=${process.env.LOG_LEVEL_APP}`, + `--log-level-scheduler=${process.env.LOG_LEVEL_SCHEDULER}`, + `--log-level-proxy=${process.env.LOG_LEVEL_PROXY}`, + `--log-level-connection=${process.env.LOG_LEVEL_CONNECTION}`, `--wallet-private-key=${config.privateKey}`, `--proxy-address=0.0.0.0:${config.proxyPort}`, From 0bba614f79d1f38c24de6782ab57ebc2cc4ae056 Mon Sep 17 00:00:00 2001 From: Scott Terry Date: Tue, 28 Nov 2023 12:30:36 -0800 Subject: [PATCH 2/3] add variables to actions --- .github/workflows/auto-publish.yml | 11 +++++++++++ .github/workflows/auto-release-dev.yml | 13 +++++++++++++ .github/workflows/auto-release-stg.yml | 11 +++++++++++ 3 files changed, 35 insertions(+) diff --git a/.github/workflows/auto-publish.yml b/.github/workflows/auto-publish.yml index c2e4f196..3a7e0fa8 100644 --- a/.github/workflows/auto-publish.yml +++ b/.github/workflows/auto-publish.yml @@ -49,6 +49,17 @@ jobs: SYMBOL_LMR: ${{ vars.SYMBOL_LMR }} TITAN_LIGHTNING_DASHBOARD: ${{ vars.TITAN_LIGHTNING_DASHBOARD }} TITAN_LIGHTNING_POOL: ${{ vars.TITAN_LIGHTNING_POOL }} + + HASHRATE_ERROR_THRESHOLD: ${{vars.HASHRATE_ERROR_THRESHOLD}} + HASHRATE_CYCLE_DURATION: ${{vars.HASHRATE_CYCLE_DURATION}} + HASHRATE_SHARE_TIMEOUT: ${{vars.HASHRATE_SHARE_TIMEOUT}} + HASHRATE_VALIDATION_START_TIMEOUT: ${{vars.HASHRATE_VALIDATION_START_TIMEOUT}} + HASHRATE_VALIDATION_GRACE_DURATION: ${{vars.HASHRATE_VALIDATION_GRACE_DURATION}} + + LOG_LEVEL_APP: ${{vars.LOG_LEVEL_APP}} + LOG_LEVEL_SCHEDULER: ${{vars.LOG_LEVEL_SCHEDULER}} + LOG_LEVEL_PROXY: ${{vars.LOG_LEVEL_PROXY}} + LOG_LEVEL_CONNECTION: ${{vars.LOG_LEVEL_CONNECTION}} steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/auto-release-dev.yml b/.github/workflows/auto-release-dev.yml index b79f8e8a..05aefd73 100644 --- a/.github/workflows/auto-release-dev.yml +++ b/.github/workflows/auto-release-dev.yml @@ -55,6 +55,19 @@ jobs: SYMBOL_LMR: ${{ vars.SYMBOL_LMR }} TITAN_LIGHTNING_DASHBOARD: ${{ vars.TITAN_LIGHTNING_DASHBOARD }} TITAN_LIGHTNING_POOL: ${{ vars.TITAN_LIGHTNING_POOL }} + + HASHRATE_ERROR_THRESHOLD: ${{vars.HASHRATE_ERROR_THRESHOLD}} + HASHRATE_CYCLE_DURATION: ${{vars.HASHRATE_CYCLE_DURATION}} + HASHRATE_SHARE_TIMEOUT: ${{vars.HASHRATE_SHARE_TIMEOUT}} + HASHRATE_VALIDATION_START_TIMEOUT: ${{vars.HASHRATE_VALIDATION_START_TIMEOUT}} + HASHRATE_VALIDATION_GRACE_DURATION: ${{vars.HASHRATE_VALIDATION_GRACE_DURATION}} + + LOG_LEVEL_APP: ${{vars.LOG_LEVEL_APP}} + LOG_LEVEL_SCHEDULER: ${{vars.LOG_LEVEL_SCHEDULER}} + LOG_LEVEL_PROXY: ${{vars.LOG_LEVEL_PROXY}} + LOG_LEVEL_CONNECTION: ${{vars.LOG_LEVEL_CONNECTION}} + + steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/auto-release-stg.yml b/.github/workflows/auto-release-stg.yml index ac445119..5d257496 100644 --- a/.github/workflows/auto-release-stg.yml +++ b/.github/workflows/auto-release-stg.yml @@ -55,6 +55,17 @@ jobs: SYMBOL_LMR: ${{ vars.SYMBOL_LMR }} TITAN_LIGHTNING_DASHBOARD: ${{ vars.TITAN_LIGHTNING_DASHBOARD }} TITAN_LIGHTNING_POOL: ${{ vars.TITAN_LIGHTNING_POOL }} + + HASHRATE_ERROR_THRESHOLD: ${{vars.HASHRATE_ERROR_THRESHOLD}} + HASHRATE_CYCLE_DURATION: ${{vars.HASHRATE_CYCLE_DURATION}} + HASHRATE_SHARE_TIMEOUT: ${{vars.HASHRATE_SHARE_TIMEOUT}} + HASHRATE_VALIDATION_START_TIMEOUT: ${{vars.HASHRATE_VALIDATION_START_TIMEOUT}} + HASHRATE_VALIDATION_GRACE_DURATION: ${{vars.HASHRATE_VALIDATION_GRACE_DURATION}} + + LOG_LEVEL_APP: ${{vars.LOG_LEVEL_APP}} + LOG_LEVEL_SCHEDULER: ${{vars.LOG_LEVEL_SCHEDULER}} + LOG_LEVEL_PROXY: ${{vars.LOG_LEVEL_PROXY}} + LOG_LEVEL_CONNECTION: ${{vars.LOG_LEVEL_CONNECTION}} steps: - name: Checkout uses: actions/checkout@v3 From 912b5f1df971c888389823e462570b54623ef0e7 Mon Sep 17 00:00:00 2001 From: Scott Terry Date: Tue, 28 Nov 2023 12:43:14 -0800 Subject: [PATCH 3/3] output variable values for traceability --- .github/workflows/auto-publish.yml | 1 + .github/workflows/auto-release-dev.yml | 1 + .github/workflows/auto-release-stg.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/auto-publish.yml b/.github/workflows/auto-publish.yml index 3a7e0fa8..fa56b3c3 100644 --- a/.github/workflows/auto-publish.yml +++ b/.github/workflows/auto-publish.yml @@ -134,6 +134,7 @@ jobs: fi fi done + cat .env shell: bash - name: Fetch latest Proxy Router run: | diff --git a/.github/workflows/auto-release-dev.yml b/.github/workflows/auto-release-dev.yml index 05aefd73..e355c40d 100644 --- a/.github/workflows/auto-release-dev.yml +++ b/.github/workflows/auto-release-dev.yml @@ -142,6 +142,7 @@ jobs: fi fi done + cat .env shell: bash - name: Fetch latest Proxy Router run: | diff --git a/.github/workflows/auto-release-stg.yml b/.github/workflows/auto-release-stg.yml index 5d257496..a4a928ee 100644 --- a/.github/workflows/auto-release-stg.yml +++ b/.github/workflows/auto-release-stg.yml @@ -140,6 +140,7 @@ jobs: fi fi done + cat .env shell: bash - name: Fetch latest Proxy Router run: |