Merge pull request #223 from shutter-network/staging

Staging
shutter-network · Dec 5, 2024 · 8a34426 · 8a34426
2 parents d169e18 + ab5fb28
commit 8a34426
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -56,24 +56,12 @@ jobs:
               exit 1  # Exit if the branch name is not valid
           fi
 
-  # Staging Deployment (with Tagging)
-  deploy_instance_staging:
+  version_bump:
     if: github.ref == 'refs/heads/staging' && github.event_name == 'push'
     runs-on: ubuntu-latest
-    needs: run_cypress_tests
+    needs: [run_cypress_tests, validate_branch_name]
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      # Fetch tags to get the latest version tag
-      - name: Fetch tags
-        run: git fetch --tags
-
-      # Install semver for version bumping
-      - name: Install semver
-        run: npm install -g semver
-
       # Determine version bump after a merge to staging
       - name: Determine version bump
         id: version_bump
@@ -131,6 +119,24 @@ jobs:
           git tag "v${{ env.NEXT_VERSION }}"
           git push origin "v${{ env.NEXT_VERSION }}"
 
+  # Staging Deployment (with Tagging)
+  deploy_instance_staging:
+    if: github.ref == 'refs/heads/staging' && github.event_name == 'push'
+    runs-on: ubuntu-latest
+    needs: [run_cypress_tests, version_bump]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # Fetch tags to get the latest version tag
+      - name: Fetch tags
+        run: git fetch --tags
+
+      # Install semver for version bumping
+      - name: Install semver
+        run: npm install -g semver
+
       # Setup SSH for deployment
       - name: Setup SSH
         run: |

diff --git a/docker/.env.example b/docker/.env.example
@@ -18,4 +18,5 @@ GENESIS_TIMESTAMP=
 SLOT_DURATION=
 SLOTS_PER_EPOCH=
 TOTAL_GNOSIS_VALIDATORS=
+INCLUSION_DELAY=
 LOKI_URL=https://<user_id>:<password>@logs.metrics.shutter.network/insert/loki/api/v1/push
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -25,8 +25,10 @@ services:
         DB_SSL_MODE: disable
         P2P_BOOTSTRAP_ADDRESSES:
         P2P_ENVIRONMENT: 
-        P2P_DISCOVERY_NAMESPACE: 
-    command: ["start", "--rpc-url", "${RPC_URL}", "--beacon-api-url", "${BEACON_API_URL}", "--sequencer-contract-address", "${SEQUENCER_CONTRACT_ADDRESS}", "--validator-registry-contract-address", "${VALIDATOR_REGISTRY_CONTRACT_ADDRESS}", "--p2pkey", "${P2P_KEY}"]
+        P2P_DISCOVERY_NAMESPACE:
+        INCLUSION_DELAY: ${INCLUSION_DELAY} 
+
+    command: ["start", "--rpc-url", "${RPC_URL}", "--beacon-api-url", "${BEACON_API_URL}", "--sequencer-contract-address", "${SEQUENCER_CONTRACT_ADDRESS}", "--validator-registry-contract-address", "${VALIDATOR_REGISTRY_CONTRACT_ADDRESS}", "--p2pkey", "${P2P_KEY}", "--inclusion-delay", "${INCLUSION_DELAY}"]
 
   db:
     image: postgres:14.12

diff --git a/observer b/observer
+1 −1		Dockerfile
+12 −0		cmd/cli/cli.go
+1 −0		common/config.go
+5 −0		common/database/types.go
+5 −0		common/utils/chain.go
+8 −1		docker-compose.yml
+3 −33		go.mod
+2 −278		go.sum
+179 −153		internal/metrics/tx_mapper_db.go
+0 −48		internal/scheduler/proposer_duties.go
+0 −4		internal/scheduler/scheduler.go
+10 −7		internal/watcher/blocks.go
+2 −2		internal/watcher/decryption_keys.go
+24 −2		internal/watcher/watcher.go
+2 −1		tests/init_test.go
+8 −0		tests/transaction_test.go
+8 −2		tests/tx_mapper_test.go
+153 −0		tests/validator_test.go