chore: fix merge conflicts

.github/workflows/build.yaml

@@ -79,19 +79,14 @@ jobs:
         run: cp ${{ matrix.sqlite-path }}node_sqlite3.node ./dist/
 
       # Windows Code Signing
-      - name: Decode code signing cert into an encrypted file
-        if: matrix.runs-on == 'windows-2019'
-        uses: kitek/[email protected]
-        with:
-          encoded-value: ${{ secrets.WIN_CODE_SIGN_CERT }}
-          destination-file: .\win_code_sign_cert.pfx
-
       - name: Sign windows artifacts
         if: matrix.runs-on == 'windows-2019'
-        uses: chia-network/actions/sign/windows@main
+        uses: chia-network/actions/digicert/windows-sign@main
         with:
-          certificate_path: .\win_code_sign_cert.pfx
-          certificate_password: ${{ secrets.WIN_CODE_SIGN_PASSWORD }}
+          sm_api_key: ${{ secrets.SM_API_KEY }}
+          sm_client_cert_file_b64: ${{ secrets.SM_CLIENT_CERT_FILE_B64 }}
+          sm_client_cert_password: ${{ secrets.SM_CLIENT_CERT_PASSWORD }}
+          sm_code_signing_cert_sha1_hash: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
           file: ${{ github.workspace }}/dist/cadt.exe
 
       # Mac .pkg build + sign

README.md

@@ -114,7 +114,7 @@ In the `CHIA_ROOT` directory (usually `~/.chia/mainnet` on Linux), CADT will add
   * **IS_GOVERNANCE_BODY**: "True" or "false" toggle to enable/disable mode for this instance being a governing body.
   * **DEFAULT_FEE**: [Fee](https://docs.chia.net/mempool/) for each transaction on the Chia blockchain in mojos.  The default is 300000000 mojos (0.0003 XCH) and can be set higher or lower depending on how [busy](https://dashboard.chia.net/d/46EAA05E/mempool-transactions-and-fees?orgId=1) the Chia network is.  If a fee is set very low, it may cause a delay in transaction processing.  
   * **DEFAULT_COIN_AMOUNT**: Units are mojo.  Each DataLayer transaction needs a coin amount and the default is 300000000 mojo.  
-  * **DATALAYER_FILE_SERVER_URL**: Chia DataLayer HTTP URL and port.  If serving DataLayer files from S3, this would be the public URL of the S3 bucket.  Must be publicly available.  
+  * **DATALAYER_FILE_SERVER_URL**: Publicly available Chia DataLayer HTTP URL and port, including schema (http:// or https://).  If serving DataLayer files from S3, this would be the public URL of the S3 bucket.  Port can be omitted if using standard ports for http or https requests. 
   * **TASKS**: Section for configuring sync intervals
     * **AUDIT_SYNC_TASK_INTERVAL**:  Default 30
     * **DATAMODEL_SYNC_TASK_INTERVAL**:  Default 60