From 09e64bf062329843d6b7ede4b6447d805913c50d Mon Sep 17 00:00:00 2001
From: Alex Sedighi <alex@nodle.com>
Date: Mon, 27 Feb 2023 12:06:54 +1300
Subject: [PATCH 1/2] feat(nodle-parachain): enforce dalek verification for old
 blocks

---
 node/src/service.rs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/node/src/service.rs b/node/src/service.rs
index 7199b1d663b..dcf07aaf6e1 100644
--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -145,6 +145,26 @@ where
 	)?;
 	let client = Arc::new(client);
 
+	// Set the block number until which ed25519-dalek should be used for signature verification
+	// Check out https://github.com/paritytech/substrate/pull/12661
+	// TODO https://github.com/NodleCode/chain/issues/703
+	const EDEN_BLOCK_NUMBER_UNTIL_DALEK_SHOULD_BE_USED: u32 = 2_500_000;
+	const PARADIS_BLOCK_NUMBER_UNTIL_DALEK_SHOULD_BE_USED: u32 = 2_000_000;
+	use sc_client_api::ExecutorProvider;
+	match config.chain_spec.id() {
+		"para_eden" => client.execution_extensions().set_extensions_factory(
+			sc_client_api::execution_extensions::ExtensionBeforeBlock::<Block, sp_io::UseDalekExt>::new(
+				EDEN_BLOCK_NUMBER_UNTIL_DALEK_SHOULD_BE_USED,
+			),
+		),
+		"para_eden_testing_0510" => client.execution_extensions().set_extensions_factory(
+			sc_client_api::execution_extensions::ExtensionBeforeBlock::<Block, sp_io::UseDalekExt>::new(
+				PARADIS_BLOCK_NUMBER_UNTIL_DALEK_SHOULD_BE_USED,
+			),
+		),
+		_ => (),
+	};
+
 	let telemetry_worker_handle = telemetry.as_ref().map(|(worker, _)| worker.handle());
 
 	let telemetry = telemetry.map(|(worker, telemetry)| {

From 9f268f78799424792c8167f9bde6b2749e077422 Mon Sep 17 00:00:00 2001
From: Alex Sedighi <alex@nodle.com>
Date: Mon, 27 Feb 2023 12:07:59 +1300
Subject: [PATCH 2/2] docker: create a special image

---
 .github/workflows/docker.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 3d54a0aed2f..82bb75698ea 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -38,15 +38,13 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Login to GHCR
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2 
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -55,6 +53,8 @@ jobs:
         with:
           context: .
           file: './Dockerfile'
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
+          push: true
+          tags: |
+            nodlecode/chain:dalek-zebra-rc2
+            ghcr.io/nodlecode/chain:dalek-zebra-rc2
           labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file