feat(nix): fixup composable node name and integrate revision

Author: hussein-aitlahcen

.github/workflows/release-artifacts.yml

@@ -171,7 +171,7 @@ jobs:
       - name: Release docker image
         run: |
           docker load --input ./composable-docker-image
-          docker tag composable-node-release-${{ env.COMPOSABLE_VERSION }}:latest "${{ env.DOCKER_REGISTRY_NAME }}/composable:v${{ env.COMPOSABLE_VERSION }}"
+          docker tag composable:latest "${{ env.DOCKER_REGISTRY_NAME }}/composable:v${{ env.COMPOSABLE_VERSION }}"
           docker push "${{ env.DOCKER_REGISTRY_NAME }}/composable:v${{ env.COMPOSABLE_VERSION }}"
 
       - name: Get commit

code/Cargo.lock

@@ -4,7 +4,7 @@ build = "build.rs"
 edition = "2021"
 homepage = "https://composable.finance"
 name = "composable-node"
-version = "2.1.6"
+version = "2.3.2"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

code/parachain/node/Cargo.toml

@@ -5,10 +5,7 @@
   # nixConfig.sandbox = "relaxed";
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    flake-utils = {
-      url = "github:numtide/flake-utils";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    flake-utils = { url = "github:numtide/flake-utils"; };
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -290,36 +287,41 @@
           # /nix/store/523zlfzypzcr969p058i6lcgfmg889d5-stdenv-linux/setup: line 1393: --message-format: command not found
           composable-node = with packages;
             crane-nightly.buildPackage (common-attrs // {
-              pnameSuffix = "-node";
+              name = "composable";
               cargoArtifacts = common-deps;
               cargoBuildCommand =
                 "cargo build --release --package composable --features=builtin-wasm";
               DALI_RUNTIME = "${dali-runtime}/lib/runtime.optimized.wasm";
               PICASSO_RUNTIME = "${picasso-runtime}/lib/runtime.optimized.wasm";
               COMPOSABLE_RUNTIME =
                 "${composable-runtime}/lib/runtime.optimized.wasm";
+              SUBSTRATE_CLI_GIT_COMMIT_HASH = self.rev or "dirty";
               installPhase = ''
                 mkdir -p $out/bin
-                cp target/release/composable $out/bin/composable-node
+                cp target/release/composable $out/bin/composable
               '';
-              meta = { mainProgram = "composable-node"; };
+              meta = { mainProgram = "composable"; };
             });
 
           composable-node-release = crane-nightly.buildPackage (common-attrs
             // {
-              pnameSuffix = "-node-release";
+              name = "composable";
               cargoArtifacts = common-deps;
               cargoBuildCommand = "cargo build --release --package composable";
+              SUBSTRATE_CLI_GIT_COMMIT_HASH = if self ? rev then
+                self.rev
+              else
+                builtins.abort "Cannot build the release node in a dirty repo.";
               installPhase = ''
                 mkdir -p $out/bin
-                cp target/release/composable $out/bin/composable-node
+                cp target/release/composable $out/bin/composable
               '';
-              meta = { mainProgram = "composable-node"; };
+              meta = { mainProgram = "composable"; };
             });
 
           composable-bench-node = crane-nightly.cargoBuild (common-bench-attrs
             // {
-              pnameSuffix = "-node";
+              name = "composable";
               cargoArtifacts = common-bench-deps;
               cargoBuildCommand = "cargo build --release --package composable";
               DALI_RUNTIME = "${dali-bench-runtime}/lib/runtime.optimized.wasm";
@@ -329,14 +331,14 @@
                 "${composable-bench-runtime}/lib/runtime.optimized.wasm";
               installPhase = ''
                 mkdir -p $out/bin
-                cp target/release/composable $out/bin/composable-node
+                cp target/release/composable $out/bin/composable
               '';
-              meta = { mainProgram = "composable-node"; };
+              meta = { mainProgram = "composable"; };
             });
 
           run-with-benchmarks = chain:
             writeShellScriptBin "run-benchmarks-once" ''
-              ${composable-bench-node}/bin/composable-node benchmark pallet \
+              ${composable-bench-node}/bin/composable benchmark pallet \
               --chain="${chain}" \
               --execution=wasm \
               --wasm-execution=compiled \
@@ -1082,7 +1084,7 @@
             };
             composable = {
               type = "app";
-              program = "${packages.composable-node}/bin/composable-node";
+              program = "${packages.composable-node}/bin/composable";
             };
             acala = {
               type = "app";

flake.nix

@@ -32,7 +32,7 @@ in {
         wsPort = 9988;
         count = 2;
         chain = "dali-dev";
-        bin = "${composable-bin}/bin/composable-node";
+        bin = "${composable-bin}/bin/composable";
       }
       {
         id = 2000;

scripts/polkadot-launch/kusama-local-dali-dev-karura-dev.nix

@@ -12,7 +12,7 @@ in {
     relaychain = {
       bin = "${polkadot-bin}/bin/polkadot";
       # NOTE: kusama-dev and kusama-local failed to connect in 10 minutes, seems need to change spec to work faster
-      # NOTE: `-dev` has long `timeouts`, so `-local` is for testing 
+      # NOTE: `-dev` has long `timeouts`, so `-local` is for testing
       chain = "rococo-local";
       port = 30444;
       wsPort = 9944;
@@ -33,7 +33,7 @@ in {
         wsPort = 9988;
         count = 2;
         chain = "picasso-dev";
-        bin = "${composable-bin}/bin/composable-node";
+        bin = "${composable-bin}/bin/composable";
       }
       {
         id = 2000;

scripts/polkadot-launch/kusama-local-picasso-dev-karura-dev.nix

@@ -29,7 +29,7 @@ in {
       wsPort = 9988;
       count = 3;
       chain = "dali-dev";
-      bin = "${composable-bin}/bin/composable-node";
+      bin = "${composable-bin}/bin/composable";
       flags = [
         "--unsafe-ws-external"
         "--unsafe-rpc-external"