Merge pull request #1707 from CounterpartyXCP/develop

v10.1.1
CounterpartyXCP · Apr 19, 2024 · fc3957b · fc3957b
2 parents a02a28e + e67d9c6
commit fc3957b
Show file tree

Hide file tree

Showing 150 changed files with 1,978 additions and 1,919 deletions.
diff --git a/.github/workflows/bandit.yml b/.github/workflows/bandit.yml
@@ -40,7 +40,7 @@ jobs:
           # Report only issues of a given confidence level or higher. Can be LOW, MEDIUM or HIGH. Default is UNDEFINED (everything)
           # confidence: # optional, default is UNDEFINED
           # comma-separated list of paths (glob patterns supported) to exclude from scan (note that these are in addition to the excluded paths provided in the config file) (default: .svn,CVS,.bzr,.hg,.git,__pycache__,.tox,.eggs,*.egg)
-          excluded_paths: "*/test/*,*/counterparty-lib/tools/*" # optional, default is DEFAULT
+          excluded_paths: "*/test/*,*/counterparty-core/tools/*" # optional, default is DEFAULT
           # comma-separated list of test IDs to skip
           skips: "B101" # optional, default is DEFAULT
           # path to a .bandit file that supplies command line arguments

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -52,10 +52,6 @@ jobs:
         with:
           args: --release --out dist --sdist -m ${{ env.COUNTERPARTY_RS_DIR }}/Cargo.toml
 
-      - name: Build counterparty-lib
-        run: |
-          cd counterparty-lib && hatch build ../dist
-
       - name: Build counterparty-core
         run: |
           cd counterparty-core && hatch build ../dist
@@ -66,11 +62,11 @@ jobs:
         run: |
           pip install dist/*.whl --force-reinstall
 
-      # Run counterparty-lib tests
+      # Run counterparty-core tests
 
-      - name: Run counterparty-lib tests
+      - name: Run counterparty-core tests
         run: |
-          cd counterparty-lib
+          cd counterparty-core
           pytest
 
       # Upload wheels
@@ -116,10 +112,6 @@ jobs:
         with:
           args: --release --out dist --sdist -m ${{ env.COUNTERPARTY_RS_DIR }}/Cargo.toml
 
-      - name: Build counterparty-lib
-        run: |
-          cd counterparty-lib && hatch build ../dist
-
       - name: Build counterparty-core
         run: |
           cd counterparty-core && hatch build ../dist
@@ -132,11 +124,11 @@ jobs:
           export CPATH="$CPATH:$(brew --prefix)/include"
           pip3.10 install dist/*.whl --force-reinstall
 
-      # Run counterparty-lib tests
+      # Run counterparty-core tests
 
-      - name: Run counterparty-lib tests
+      - name: Run counterparty-core tests
         run: |
-          cd counterparty-lib
+          cd counterparty-core
           pytest
 
       # Upload wheels
@@ -182,10 +174,6 @@ jobs:
         with:
           args: --release --out dist --sdist -m ${{ env.COUNTERPARTY_RS_DIR }}/Cargo.toml
 
-      - name: Build counterparty-lib
-        run: |
-          cd counterparty-lib && hatch build ../dist
-
       - name: Build counterparty-core
         run: |
           cd counterparty-core && hatch build ../dist
@@ -196,11 +184,11 @@ jobs:
         run: |
           pip install dist/*.whl --force-reinstall
 
-      # Run counterparty-lib tests
+      # Run counterparty-core tests
 
-      - name: Run counterparty-lib tests
+      - name: Run counterparty-core tests
         run: |
-          cd counterparty-lib
+          cd counterparty-core
           pytest
 
       # Upload wheels

diff --git a/.github/workflows/license_scanner.yml b/.github/workflows/license_scanner.yml
@@ -29,12 +29,11 @@ jobs:
         python -m pip install --upgrade pip
         pip install license_scanner maturin sh
         cd counterparty-rs && pip install -e . && cd ..
-        cd counterparty-lib && pip install -e . && cd ..
         cd counterparty-core && pip install -e . && cd ..
         pip install evdev
     - name: Analysing dependencies with licence_scanner
       run: |
-        python counterparty-lib/tools/checklicences.py
+        python counterparty-core/tools/checklicences.py
     - name: Upload SARIF
       uses: github/codeql-action/upload-sarif/@v2
       with:

diff --git a/.github/workflows/publish_docker_image.yml b/.github/workflows/publish_docker_image.yml
@@ -20,7 +20,7 @@ jobs:
         sudo sh get-docker.sh
     - name: Build, tag, login and push image
       run: |
-        export VERSION=v$(cat counterparty-lib/counterpartylib/lib/config.py | grep '__version__ =' | awk -F '"' '{print $2}')
+        export VERSION=v$(cat counterparty-core/counterpartycore/lib/config.py | grep '__version__ =' | awk -F '"' '{print $2}')
         docker build -t $DOCKER_REPO:$VERSION .
         docker tag $DOCKER_REPO:$VERSION $DOCKER_REPO:latest
         docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"

diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -30,12 +30,11 @@ jobs:
         pip install pylint maturin
         pip install pylint-sarif-unofficial
         cd counterparty-rs && pip install -e . && cd ..
-        cd counterparty-lib && pip install -e . && cd ..
         cd counterparty-core && pip install -e . && cd ..
         pip install evdev
     - name: Analysing the code with pylint
       run: |
-        pylint2sarif $(git ls-files '*.py' | grep -v counterparty-rs/tests/ | grep -v counterparty-lib/counterpartylib/test/ | grep -v counterparty-lib/tools/) || true
+        pylint2sarif $(git ls-files '*.py' | grep -v counterparty-rs/tests/ | grep -v counterparty-core/counterpartycore/test/ | grep -v counterparty-core/tools/) || true
     - name: Upload SARIF
       uses: github/codeql-action/upload-sarif/@v2
       with:

diff --git a/.github/workflows/test_book.yml b/.github/workflows/test_book.yml
@@ -29,12 +29,11 @@ jobs:
         python -m pip install --upgrade pip
         pip install pylint maturin pytest
         cd counterparty-rs && pip install -e . && cd ..
-        cd counterparty-lib && pip install -e . && cd ..
         cd counterparty-core && pip install -e . && cd ..
     - name: Bootstrap testnet database
       run: |
         counterparty-server --testnet bootstrap --no-confirm
     - name: Run tests
       run: |
-        cd counterparty-lib
-        pytest counterpartylib/test/book_test.py --testbook -s
+        cd counterparty-core
+        pytest counterpartycore/test/book_test.py --testbook -s
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,7 @@ profile.txt
 *.pyc
 
 # files generated by py.test
-/counterpartylib/test/fixtures/scenarios/*.new.*
+/counterpartycore/test/fixtures/scenarios/*.new.*
 .coverage
 
 # Compiled python modules.

diff --git a/Dockerfile b/Dockerfile
@@ -17,17 +17,12 @@ RUN pip3 install maturin
 # copy repository
 COPY README.md /README.md
 COPY ./counterparty-rs /counterparty-rs
-COPY ./counterparty-lib /counterparty-lib
 COPY ./counterparty-core /counterparty-core
 
-# install counterparty-lib
+# install counterparty-rs
 WORKDIR /counterparty-rs
 RUN pip3 install .
 
-# install counterparty-lib
-WORKDIR /counterparty-lib
-RUN pip3 install .
-
 # install counterparty-core
 WORKDIR /counterparty-core
 RUN pip3 install .

diff --git a/RELEASE.md b/RELEASE.md
@@ -5,6 +5,7 @@
 - [ ] Update Counterparty Docker images versions in the `docker-compose.yml` files
 - [ ] Review all open pull requests
 - [ ] Write release notes
+- [ ] Add a checkpoint verified on all supported versions
 - [ ] Create pull request against `master`
 - [ ] Ensure all tests pass in CI
 - [ ] Merge PR into `master`