Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
20 changes: 20 additions & 0 deletions node/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)| {
Expand Down