Merge branch 'main' into PAN-2261-2262-polygon-pos-and-sonic-support

pantos-io · Oct 18, 2024 · dbd1e77 · dbd1e77
2 parents 7662dfb + f3b1a7a
commit dbd1e77
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.12"]
         architecture: ["amd64"]
     steps:
       - name: Harden Runner

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -69,9 +69,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-v1.0-service-node-${{ matrix.arch}}-${{ github.ref_name }}
+          key: ${{ runner.os }}-buildx-v1.0-service-node-${{ matrix.arch }}-${{ github.ref_name }}
           restore-keys: |
-            ${{ runner.os }}-buildx-v1.0-service-node-${{ matrix.arch}}-
+            ${{ runner.os }}-buildx-v1.0-service-node-${{ matrix.arch }}-
 
       - name: Check docker config and disable live reload
         run: |

diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
@@ -50,9 +50,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-v1.0-service-node-${{ github.sha }}
+          key: ${{ runner.os }}-to-publish-service-node-${{ matrix.arch }}-${{ github.ref_name }}
           restore-keys: |
-            ${{ runner.os }}-buildx-v1.0-service-node-
+            ${{ runner.os }}-to-publish-service-node-${{ matrix.arch }}-
 
       - uses: actions/download-artifact@v4
         with:
@@ -89,7 +89,7 @@ jobs:
           docker buildx bake \
             --set "*.cache-from=type=local,src=/tmp/.buildx-cache" \
             --set "*.cache-to=type=local,dest=/tmp/.buildx-cache-new" \
-            --set "*.platform=linux/amd64,linux/arm64" \
+            --set "*.platform=linux/amd64" \
             --builder ${{ steps.buildx.outputs.name }} \
             --sbom=true \
             --push \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -67,10 +67,10 @@ services:
           target: /opt/pantos/pantos-service-node/alembic.ini
         - action: sync+restart
           path: service-node-config.env
-          target: /root/service-node-config.env
+          target: /etc/pantos/service-node-config.env
         - action: sync+restart
           path: bids.yml
-          target: /etc/service-node-bids.yml
+          target: /etc/pantos/service-node-bids.yml
         - action: rebuild
           path: Dockerfile
         - action: rebuild
@@ -141,10 +141,10 @@ services:
           target: /opt/pantos/pantos-service-node/alembic.ini
         - action: sync+restart
           path: service-node-config.env
-          target: /root/service-node-config.env
+          target: /etc/pantos/service-node-config.env
         - action: sync+restart
           path: bids.yml
-          target: /etc/service-node-bids.yml
+          target: /etc/pantos/service-node-bids.yml
         - action: rebuild
           path: Dockerfile
         - action: rebuild

diff --git a/pantos/servicenode/business/plugins.py b/pantos/servicenode/business/plugins.py
@@ -69,8 +69,9 @@ def replace_bids(self, source_blockchain: Blockchain) -> int:
                 bids, delay = bid_plugin.get_bids(source_blockchain.value,
                                                   destination_blockchain.value,
                                                   **bids_arguments)
-                self.__add_validator_fee(bids, source_blockchain_factor,
-                                         destination_blockchain_factor)
+                if source_blockchain is not destination_blockchain:
+                    self.__add_validator_fee(bids, source_blockchain_factor,
+                                             destination_blockchain_factor)
                 _logger.debug(f'Saving {len(bids)} bids in database')
                 bids = [dataclasses.asdict(bid) for bid in bids]
                 replace_bids(source_blockchain.value,

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -43,7 +43,7 @@ Cerberus = "1.3.4"
 Flask = "3.0.3"
 Flask-Cors = "5.0.0"
 Flask-RESTful = "0.3.10"
-marshmallow = "3.22.0"
+marshmallow = "3.23.0"
 psycopg2-binary = "2.9.10"
 PyYAML = "6.0.1"
 SQLAlchemy = "2.0.36"