Merge pull request #2129 from CounterpartyXCP/develop

v10.3.1

.github/workflows/build_and_test.yml

@@ -21,20 +21,14 @@ jobs:
 
       # Install dependencies
 
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
-
       - name: Set up Homebrew
         id: set-up-homebrew
         uses: Homebrew/actions/setup-homebrew@master
 
       - name: Install Python 3.10 and leveldb
         run: |
-          brew install [email protected] leveldb
+          brew install rustup [email protected] leveldb
+          brew reinstall rustup
           echo '/opt/homebrew/opt/[email protected]/libexec/bin' >> $GITHUB_PATH
 
       - name: Install pytest and build module
@@ -93,12 +87,10 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: "pip"
 
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+      - name: Install Rust
+        run: |
+          curl https://sh.rustup.rs -sSf | sh -s -- -y
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
       - name: Install leveldb
         run: |

.github/workflows/test_book.yml

@@ -32,7 +32,7 @@ jobs:
         cd counterparty-core && pip install -e . && cd ..
     - name: Bootstrap testnet database
       run: |
-        counterparty-server --testnet bootstrap --no-confirm --bootstrap-url "https://bootstrap.counterparty.io/counterparty-testnet.v10.3.0.tar.gz"
+        counterparty-server --testnet bootstrap --no-confirm
     - name: Run tests
       run: |
         cd counterparty-core

.github/workflows/test_compose.sh

@@ -18,6 +18,9 @@ cd counterparty-core
 
 VERSION=$(cat docker-compose.yml | grep 'image: counterparty/counterparty:' | awk -F ":" '{print $3}')
 
+# verbose mode
+sed -i 's/#- "--verbose"/-  "-vv"/g' docker-compose.yml
+
 # stop the running containers
 docker compose --profile mainnet stop counterparty-core
 docker compose --profile testnet stop counterparty-core-testnet
@@ -108,7 +111,7 @@ docker compose --profile mainnet run counterparty-core reparse $REPARSE_FROM \
 docker compose --profile mainnet up -d counterparty-core
 
 # wait for counterparty-core to be ready
-while [ "$(docker compose logs counterparty-core 2>&1 | grep 'Watching for new blocks')" = "" ]; do
+while [ "$(docker compose logs counterparty-core 2>&1 | grep 'API Watcher - Catch up completed')" = "" ]; do
     echo "Waiting for counterparty-core mainnet to be ready"
     sleep 1
 done

.github/workflows/test_compose.yml

@@ -2,7 +2,7 @@ name: Docker Compose
 
 on:
   push:
-    branches: ['develop', 'master', 'apidb']
+    branches: ['develop', 'master', 'testcompose']
 
 jobs:
   build: