Merge pull request #2921 from CounterpartyXCP/develop

v10.9.0-rc.1
CounterpartyXCP · Jan 9, 2025 · ad16168 · ad16168 · adamkrellenstein · Jan 9, 2025
2 parents 3c59e5a + 7bcf502
commit ad16168
Show file tree

Hide file tree

Showing 159 changed files with 29,441 additions and 29,866 deletions.
diff --git a/.github/workflows/propertytest.yml b/.github/workflows/propertytest.yml
@@ -35,14 +35,11 @@ jobs:
         cd counterparty-rs && pip install -e . && cd ..
         cd counterparty-core && pip install -e . && cd ..
         pip install evdev
-        git clone https://github.com/CounterpartyXCP/addrindexrs.git
-        cd addrindexrs
-        cargo install --path=.
-        wget https://bitcoincore.org/bin/bitcoin-core-27.1/bitcoin-27.1-x86_64-linux-gnu.tar.gz
-        tar -xvf bitcoin-27.1-x86_64-linux-gnu.tar.gz
-        sudo cp bitcoin-27.1/bin/bitcoin-cli /usr/local/bin/bitcoin-cli
-        sudo cp bitcoin-27.1/bin/bitcoind /usr/local/bin/bitcoind
-        sudo cp bitcoin-27.1/bin/bitcoin-wallet /usr/local/bin/bitcoin-wallet
+        wget https://bitcoincore.org/bin/bitcoin-core-28.0/bitcoin-28.0-x86_64-linux-gnu.tar.gz
+        tar -xvf bitcoin-28.0-x86_64-linux-gnu.tar.gz
+        sudo cp bitcoin-28.0/bin/bitcoin-cli /usr/local/bin/bitcoin-cli
+        sudo cp bitcoin-28.0/bin/bitcoind /usr/local/bin/bitcoind
+        sudo cp bitcoin-28.0/bin/bitcoin-wallet /usr/local/bin/bitcoin-wallet
         npm install dredd --global
     - name: Run regtest tests
       run: |

diff --git a/.github/workflows/publish_docker_image.yml b/.github/workflows/publish_docker_image.yml
@@ -4,8 +4,7 @@ on:
   release:
     types: [published]
   push:
-    branches:
-      - develop
+    branches: "**"
 
 env:
   DOCKER_REPO: counterparty/counterparty
@@ -27,6 +26,8 @@ jobs:
           export VERSION=v$(cat counterparty-core/counterpartycore/lib/config.py | grep '__version__ =' | awk -F '"' '{print $2}')
         elif [[ ${{ github.event_name }} == 'push' && ${{ github.ref }} == 'refs/heads/develop' ]]; then
           export VERSION=develop
+        else
+          export VERSION=${{ github.sha }}
         fi
         docker build -t $DOCKER_REPO:$VERSION .
         docker tag $DOCKER_REPO:$VERSION $DOCKER_REPO:latest

diff --git a/.github/workflows/regtest.yml b/.github/workflows/regtest.yml
@@ -35,15 +35,14 @@ jobs:
         cd counterparty-rs && pip install -e . && cd ..
         cd counterparty-core && pip install -e . && cd ..
         pip install evdev
-        git clone https://github.com/CounterpartyXCP/addrindexrs.git
-        cd addrindexrs
-        cargo install --path=.
-        wget https://bitcoincore.org/bin/bitcoin-core-27.1/bitcoin-27.1-x86_64-linux-gnu.tar.gz
-        tar -xvf bitcoin-27.1-x86_64-linux-gnu.tar.gz
-        sudo cp bitcoin-27.1/bin/bitcoin-cli /usr/local/bin/bitcoin-cli
-        sudo cp bitcoin-27.1/bin/bitcoind /usr/local/bin/bitcoind
-        sudo cp bitcoin-27.1/bin/bitcoin-wallet /usr/local/bin/bitcoin-wallet
+        wget https://bitcoincore.org/bin/bitcoin-core-28.0/bitcoin-28.0-x86_64-linux-gnu.tar.gz
+        tar -xvf bitcoin-28.0-x86_64-linux-gnu.tar.gz
+        sudo cp bitcoin-28.0/bin/bitcoin-cli /usr/local/bin/bitcoin-cli
+        sudo cp bitcoin-28.0/bin/bitcoind /usr/local/bin/bitcoind
+        sudo cp bitcoin-28.0/bin/bitcoin-wallet /usr/local/bin/bitcoin-wallet
         npm install dredd --global
+        git clone https://github.com/mempool/electrs && cd electrs
+        cargo install --path=.
     - name: Run regtest tests
       run: |
         cd counterparty-core

diff --git a/.github/workflows/test_compose.sh b/.github/workflows/test_compose.sh
@@ -110,7 +110,6 @@ sudo touch $LOG_PATH
 docker compose --profile mainnet stop counterparty-core
 docker compose --profile mainnet run counterparty-core reparse $REPARSE_FROM \
    --backend-connect=bitcoind \
-   --indexd-connect=addrindexrs \
    --rpc-host=0.0.0.0 \
    --api-host=0.0.0.0