git.delta.rocks / unique-network / refs/commits / c6842c8d831a

difftreelog

Merge pull request #815 from UniqueNetwork/feature/sapphire-is-quartz

Yaroslav Bolyukin2022-12-29parents: #a2c419c #4dff934.patch.diff
in: master
Move sapphire to quartz

11 files changed

modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-data.yml
+++ b/.github/workflows/forkless-update-data.yml
@@ -38,14 +38,14 @@
             network {quartz}, wasm_name {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}
             network {unique}, wasm_name {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}}
             network {opal}, wasm_name {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}
-            network {sapphire}, wasm_name {opal}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, replica_from_address {${{ env.SAPPHIRE_REPLICA_FROM }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}}
+            network {sapphire}, wasm_name {quartz}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, replica_from_address {${{ env.SAPPHIRE_REPLICA_FROM }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}}
 
   forkless-update-data:
     needs: execution-marix
     # The type of runner that the job will run on
     runs-on: [self-hosted-ci,large]
     timeout-minutes: 1380
-    
+
     name: ${{ matrix.network }}-data
     strategy:
       matrix:
@@ -74,7 +74,7 @@
             REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
             POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}
-            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}            
+            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
             # POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             # MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
@@ -163,7 +163,7 @@
       - name: Stop running containers
         if: always()                   # run this step always
         run: docker-compose -f ".docker/docker-compose-forkless-data.${{ matrix.network }}.yml" down --volumes
-        
+
       - name: Remove builder cache
         if: always()                   # run this step always
         run: |
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -37,7 +37,7 @@
             network {quartz}, wasm_name {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}
             network {unique}, wasm_name {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}}
             network {opal}, wasm_name {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}
-            network {sapphire}, wasm_name {opal}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}}
+            network {sapphire}, wasm_name {quartz}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}}
 
 
   forkless-update-nodata:
@@ -53,7 +53,7 @@
 
     strategy:
       matrix:
-        include: ${{fromJson(needs.execution-marix.outputs.matrix)}}    
+        include: ${{fromJson(needs.execution-marix.outputs.matrix)}}
 
     steps:
       - name: Clean Workspace
@@ -76,7 +76,7 @@
             REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
             POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}
-            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}            
+            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
             # POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             # MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
@@ -163,8 +163,8 @@
       - name: Show docker logs
         if: success() || failure()
         run: cat './forkless-parachain-upgrade-nodata-logs.${{ matrix.features }}/node-parachain.log'
-                
-      - name: Run Parallel tests 
+
+      - name: Run Parallel tests
         working-directory: tests
         run: |
           yarn install
@@ -175,7 +175,7 @@
           NOW=$(date +%s) && yarn testParallel --reporter mochawesome --reporter-options reportFilename=test-parallel-${NOW}
         env:
           RPC_URL: http://127.0.0.1:9933/
-    
+
       - name: Test Report Parallel
         uses: phoenix-actions/test-reporting@v8
         id: test-report-parallel
@@ -185,10 +185,10 @@
           path: tests/mochawesome-report/test-parallel-*.json    # Path to test results
           reporter: mochawesome-json
           fail-on-error: 'false'
-          
-      - name: Run Sequential tests 
+
+      - name: Run Sequential tests
         working-directory: tests
-        if: success() || failure() 
+        if: success() || failure()
         run: |
           yarn install
           yarn add mochawesome
@@ -198,7 +198,7 @@
           NOW=$(date +%s) && yarn testSequential --reporter mochawesome --reporter-options reportFilename=test-sequential-${NOW}
         env:
           RPC_URL: http://127.0.0.1:9933/
-    
+
       - name: Test Report Sequential
         uses: phoenix-actions/test-reporting@v8
         id: test-report-sequential
@@ -212,7 +212,7 @@
       - name: Stop running containers
         if: always()                   # run this step always
         run: docker-compose -f ".docker/docker-compose.${{ matrix.network }}.yml" down
-        
+
       - name: Remove builder cache
         if: always()                   # run this step always
         run: |
modified.github/workflows/integration-tests.ymldiffbeforeafterboth
after Β· .github/workflows/integration-tests.yml
1# Test workflow for debug parallel and sequental tests in scope of execution time reducing.2name: Integration tests34# Triger: only call from main workflow(re-usable workflows)5on:6  workflow_call:7#Define Workflow variables89# A workflow run is made up of one or more jobs that can run sequentially or in parallel10jobs:1112  nodes-execution-matrix:1314    name: execution matrix1516    runs-on: self-hosted-ci17    outputs:18      matrix: ${{ steps.create_matrix.outputs.matrix }}1920    steps:2122      - name: Clean Workspace23        uses: AutoModality/action-clean@v1.1.02425      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it26      - uses: actions/checkout@v327        with:28          ref: ${{ github.head_ref }}  #Checking out head commit2930      - name: Read .env file31        uses: xom9ikk/dotenv@v1.0.23233      - name: Create Execution matrix34        uses: fabiocaccamo/create-matrix-action@v235        id: create_matrix36        with:37          matrix: |38            network {opal}, wasm_name {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}39            network {sapphire}, wasm_name {quartz}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}40            network {quartz}, wasm_name {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}41            network {unique}, wasm_name {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}4243  parallel-test:44    needs: nodes-execution-matrix45    # The type of runner that the job will run on46    runs-on: [self-hosted-ci,large]4748    timeout-minutes: 13804950    name: ${{ matrix.network }} - parallel5152    continue-on-error: true         #Do not stop testing of matrix runs failed.  As it decided during PR review - it required 50/50& Let's check it with false.5354    strategy:55      matrix:56        include: ${{fromJson(needs.nodes-execution-matrix.outputs.matrix)}}5758    steps:5960      - name: Clean Workspace61        uses: AutoModality/action-clean@v1.1.06263      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it64      - uses: actions/checkout@v365        with:66          ref: ${{ github.head_ref }}  #Checking out head commit6768      - name: Read .env file69        uses: xom9ikk/dotenv@v1.0.27071      - name: Generate ENV related extend file for docker-compose72        uses: cuchi/jinja2-action@v1.2.073        with:74          template: .docker/docker-compose.tmp-node.j275          output_file: .docker/docker-compose.node.${{ matrix.network }}.yml76          variables: |77            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git78            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}79            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}80            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}81            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}82            MAINNET_TAG=${{ matrix.mainnet_tag }}83            MAINNET_BRANCH=${{ matrix.mainnet_branch }}84            NETWORK=${{ matrix.network }}85            BRANCH=${{ github.head_ref }}86            WASM_NAME=${{ matrix.wasm_name }}8788      - name: Show build configuration89        run: cat .docker/docker-compose.node.${{ matrix.network }}.yml9091      - name: Generate launch-config-forkless-nodata.json92        uses: cuchi/jinja2-action@v1.2.093        with:94          template: .docker/forkless-config/launch-config-node-update-only-v3.j295          output_file: .docker/launch-config-forkless-nodata.json96          variables: |97            NETWORK=${{ matrix.network }}9899      - name: Show launch-config-forkless configuration100        run: cat .docker/launch-config-forkless-nodata.json101102      - uses: actions/setup-node@v3103        with:104          node-version: 16105106      - name: Build the stack107        run: docker-compose -f ".docker/docker-compose.node.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate --timeout 300108109      #  πŸš€ POLKADOT LAUNCH COMPLETE πŸš€110      - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.111        if: success()112        run: |113          counter=160114          function check_container_status {115                docker inspect -f {{.State.Running}} node-parachain116          }117          function do_docker_logs {118                docker logs --details node-parachain  2>&1119          }120          function is_started {121                if [ "$(check_container_status)" == "true" ]; then122                        echo "Container: node-parachain RUNNING";123                        echo "Check Docker logs"124                        DOCKER_LOGS=$(do_docker_logs)125                        if [[ ${DOCKER_LOGS} = *"POLKADOT LAUNCH COMPLETE"* ]];then126                                echo "πŸš€ POLKADOT LAUNCH COMPLETE πŸš€"127                                return 0128                        else129                                echo "Message not found in logs output, repeating..."130                                return 1131                        fi132                else133                        echo "Container node-parachain NOT RUNNING"134                        echo "Halting all future checks"135                        exit 1136                fi137          echo "something goes wrong"138          exit 1139          }140          while ! is_started; do141                echo "Waiting for special message in log files "142                sleep 30s143                counter=$(( $counter - 1 ))144                echo "Counter: $counter"145                if [ "$counter" -gt "0" ]; then146                         continue147                else148                         break149                fi150          done151          echo "Halting script"152          exit 0153        shell: bash154155      - name: Run Parallel tests on Node Parachain156        working-directory: tests157        run: |158          yarn install159          yarn add mochawesome160          echo "Ready to start tests"161          yarn polkadot-types162          NOW=$(date +%s) && yarn testParallel --reporter mochawesome --reporter-options reportFilename=test-parallel-${NOW}163        env:164          RPC_URL: http://127.0.0.1:9933/165166      - name: Parallel Tests report167        uses: phoenix-actions/test-reporting@v8168        id: test-report-parallel169        if: success() || failure()    # run this step even if previous step failed170        with:171          name: Parallel Tests report - ${{ matrix.network }}            # Name of the check run which will be created172          path: tests/mochawesome-report/test-parallel-*.json    # Path to test results173          reporter: mochawesome-json174          fail-on-error: 'false'175176177      - name: Stop running containers178        if: always()                   # run this step always179        run: docker-compose -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes180181      - name: Remove builder cache182        if: always()                   # run this step always183        run: |184          docker builder prune -f -a185          docker system prune -f186          docker image prune -f -a187188      - name: List files in Workspace189        if: always()190        run: ls -la ./191192  sequential-test:193    needs: nodes-execution-matrix194    # The type of runner that the job will run on195    runs-on: [self-hosted-ci,large]196197    timeout-minutes: 1380198199    name: ${{ matrix.network }} - sequential200201    continue-on-error: true         #Do not stop testing of matrix runs failed.  As it decided during PR review - it required 50/50& Let's check it with false.202203    strategy:204      matrix:205        include: ${{fromJson(needs.nodes-execution-matrix.outputs.matrix)}}206207    steps:208209      - name: Clean Workspace210        uses: AutoModality/action-clean@v1.1.0211212      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it213      - uses: actions/checkout@v3214        with:215          ref: ${{ github.head_ref }}  #Checking out head commit216217      - name: Read .env file218        uses: xom9ikk/dotenv@v1.0.2219220      - name: Generate ENV related extend file for docker-compose221        uses: cuchi/jinja2-action@v1.2.0222        with:223          template: .docker/docker-compose.tmp-node.j2224          output_file: .docker/docker-compose.node.${{ matrix.network }}.yml225          variables: |226            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git227            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}228            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}229            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}230            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}231            MAINNET_TAG=${{ matrix.mainnet_tag }}232            MAINNET_BRANCH=${{ matrix.mainnet_branch }}233            NETWORK=${{ matrix.network }}234            BRANCH=${{ github.head_ref }}235            WASM_NAME=${{ matrix.wasm_name }}236237      - name: Show build configuration238        run: cat .docker/docker-compose.node.${{ matrix.network }}.yml239240      - name: Generate launch-config-forkless-nodata.json241        uses: cuchi/jinja2-action@v1.2.0242        with:243          template: .docker/forkless-config/launch-config-node-update-only-v3.j2244          output_file: .docker/launch-config-forkless-nodata.json245          variables: |246            NETWORK=${{ matrix.network }}247248      - name: Show launch-config-forkless configuration249        run: cat .docker/launch-config-forkless-nodata.json250251      - uses: actions/setup-node@v3252        with:253          node-version: 16254255      - name: Build the stack256        run: docker-compose -f ".docker/docker-compose.node.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate --timeout 300257258      #  πŸš€ POLKADOT LAUNCH COMPLETE πŸš€259      - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.260        if: success()261        run: |262          counter=160263          function check_container_status {264                docker inspect -f {{.State.Running}} node-parachain265          }266          function do_docker_logs {267                docker logs --details node-parachain  2>&1268          }269          function is_started {270                if [ "$(check_container_status)" == "true" ]; then271                        echo "Container: node-parachain RUNNING";272                        echo "Check Docker logs"273                        DOCKER_LOGS=$(do_docker_logs)274                        if [[ ${DOCKER_LOGS} = *"POLKADOT LAUNCH COMPLETE"* ]];then275                                echo "πŸš€ POLKADOT LAUNCH COMPLETE πŸš€"276                                return 0277                        else278                                echo "Message not found in logs output, repeating..."279                                return 1280                        fi281                else282                        echo "Container node-parachain NOT RUNNING"283                        echo "Halting all future checks"284                        exit 1285                fi286          echo "something goes wrong"287          exit 1288          }289          while ! is_started; do290                echo "Waiting for special message in log files "291                sleep 30s292                counter=$(( $counter - 1 ))293                echo "Counter: $counter"294                if [ "$counter" -gt "0" ]; then295                         continue296                else297                         break298                fi299          done300          echo "Halting script"301          exit 0302        shell: bash303304      - name: Run Sequential tests on Node Parachain305        working-directory: tests306        run: |307          yarn install308          yarn add mochawesome309          echo "Ready to start tests"310          yarn polkadot-types311          NOW=$(date +%s) && yarn testSequential --reporter mochawesome --reporter-options reportFilename=test-sequential-${NOW}312        env:313          RPC_URL: http://127.0.0.1:9933/314315      - name: Sequential Tests report316        uses: phoenix-actions/test-reporting@v8317        id: test-report-sequential318        if: success() || failure()    # run this step even if previous step failed319        with:320          name: Parallel Tests report - ${{ matrix.network }}            # Name of the check run which will be created321          path: tests/mochawesome-report/test-sequential-*.json    # Path to test results322          reporter: mochawesome-json323          fail-on-error: 'false'324325      - name: Stop running containers326        if: always()                   # run this step always327        run: docker-compose -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes328329      - name: Remove builder cache330        if: always()                   # run this step always331        run: |332          docker builder prune -f -a333          docker system prune -f334          docker image prune -f -a335336      - name: List files in Workspace337        if: always()338        run: ls -la ./
modified.github/workflows/node-only-update.ymldiffbeforeafterboth
--- a/.github/workflows/node-only-update.yml
+++ b/.github/workflows/node-only-update.yml
@@ -38,7 +38,7 @@
         with:
           matrix: |
             network {opal}, wasm_name {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}
-            network {sapphire}, wasm_name {opal}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}}
+            network {sapphire}, wasm_name {quartz}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}}
             network {quartz}, wasm_name {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}
             network {unique}, wasm_name {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}}
 
@@ -214,7 +214,7 @@
           docker exec node-parachain kill -SIGUSR1 ${PID}
           echo "SIGUSR1 sent to Polkadot-launch PID: $PID"
           sleep 60s
-          echo -e "Show logs of node-parachain container.\n"          
+          echo -e "Show logs of node-parachain container.\n"
           docker logs ${ContainerID}
 
       - name: Get chain logs in case of docker image crashed after Polkadot Launch restart
modified.github/workflows/try-runtime.ymldiffbeforeafterboth
--- a/.github/workflows/try-runtime.yml
+++ b/.github/workflows/try-runtime.yml
@@ -34,7 +34,7 @@
         with:
           matrix: |
             network {opal}, wasm_name {opal}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}}
-            network {sapphire}, wasm_name {opal}, replica_from_address {${{ env.SAPPHIRE_REPLICA_FROM }}}
+            network {sapphire}, wasm_name {quartz}, replica_from_address {${{ env.SAPPHIRE_REPLICA_FROM }}}
             network {quartz}, wasm_name {quartz}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}}
             network {unique}, wasm_name {unique}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}}
 
@@ -49,7 +49,7 @@
     strategy:
       matrix:
         include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}
-  
+
     steps:
 
       - name: Clean Workspace
@@ -79,13 +79,13 @@
 
       - name: Build the stack
         run: docker-compose -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" up --build  --force-recreate --timeout 300 --remove-orphans --exit-code-from try-runtime
- 
+
       - name: Collect Docker Logs
         if: success() || failure()
         uses: jwalton/gh-docker-logs@v2.2.0
         with:
           dest: './try-runtime-logs.${{ matrix.network }}'
-          images: 'try-runtime' 
+          images: 'try-runtime'
 
       - name: Show docker logs
         run: cat './try-runtime-logs.${{ matrix.network }}/try-runtime.log'
@@ -93,7 +93,7 @@
       - name: Stop running containers
         if: always()                   # run this step always
         run: docker-compose -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" down
-        
+
       - name: Remove builder cache
         if: always()                   # run this step always
         run: |
modifiednode/cli/Cargo.tomldiffbeforeafterboth
--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -340,7 +340,7 @@
     'opal-runtime?/try-runtime',
     'try-runtime-cli/try-runtime',
 ]
-sapphire-runtime = ['opal-runtime', 'opal-runtime/become-sapphire']
+sapphire-runtime = ['quartz-runtime', 'quartz-runtime/become-sapphire']
 pov-estimate = [
     'unique-runtime?/pov-estimate',
     'quartz-runtime?/pov-estimate',
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -47,7 +47,7 @@
     'sp-runtime/runtime-benchmarks',
     'xcm-builder/runtime-benchmarks',
     'pallet-maintenance/runtime-benchmarks',
-    'cumulus-pallet-parachain-system/runtime-benchmarks'
+    'cumulus-pallet-parachain-system/runtime-benchmarks',
 ]
 try-runtime = [
     'frame-try-runtime',
@@ -196,7 +196,6 @@
     'foreign-assets',
     'pallet-test-utils',
 ]
-become-sapphire = []
 pov-estimate = []
 
 refungible = []
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -44,14 +44,7 @@
 
 pub use runtime_common::*;
 
-#[cfg(feature = "become-sapphire")]
-pub const RUNTIME_NAME: &str = "sapphire";
-#[cfg(feature = "become-sapphire")]
-pub const TOKEN_SYMBOL: &str = "QTZ";
-
-#[cfg(not(feature = "become-sapphire"))]
 pub const RUNTIME_NAME: &str = "opal";
-#[cfg(not(feature = "become-sapphire"))]
 pub const TOKEN_SYMBOL: &str = "OPL";
 
 /// This runtime version.
@@ -68,15 +61,6 @@
 
 parameter_types! {
 	pub const Version: RuntimeVersion = VERSION;
-}
-#[cfg(feature = "become-sapphire")]
-parameter_types! {
-	pub const SS58Prefix: u16 = 8883;
-	pub const ChainId: u64 = 8883;
-}
-
-#[cfg(not(feature = "become-sapphire"))]
-parameter_types! {
 	pub const SS58Prefix: u16 = 42;
 	pub const ChainId: u64 = 8882;
 }
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -182,6 +182,7 @@
 ]
 limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
 quartz-runtime = ['refungible', 'app-promotion', 'collator-selection', 'foreign-assets']
+become-sapphire = []
 pov-estimate = []
 
 refungible = []
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -44,6 +44,9 @@
 
 pub use runtime_common::*;
 
+#[cfg(feature = "become-sapphire")]
+pub const RUNTIME_NAME: &str = "sapphire";
+#[cfg(not(feature = "become-sapphire"))]
 pub const RUNTIME_NAME: &str = "quartz";
 pub const TOKEN_SYMBOL: &str = "QTZ";
 
@@ -61,6 +64,15 @@
 
 parameter_types! {
 	pub const Version: RuntimeVersion = VERSION;
+}
+#[cfg(feature = "become-sapphire")]
+parameter_types! {
+	pub const SS58Prefix: u16 = 8883;
+	pub const ChainId: u64 = 8883;
+}
+
+#[cfg(not(feature = "become-sapphire"))]
+parameter_types! {
 	pub const SS58Prefix: u8 = 255;
 	pub const ChainId: u64 = 8881;
 }
modifiedtests/src/pallet-presence.test.tsdiffbeforeafterboth
--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -69,7 +69,7 @@
       const collatorSelection = ['authorship', 'session', 'collatorselection', 'identity'];
       const testUtils = 'testutils';
 
-      if (chain.eq('OPAL by UNIQUE') || chain.eq('SAPPHIRE by UNIQUE')) {
+      if (chain.eq('OPAL by UNIQUE')) {
         requiredPallets.push(
           refungible,
           foreignAssets,
@@ -77,7 +77,7 @@
           testUtils,
           ...rmrkPallets,
         );
-      } else if (chain.eq('QUARTZ by UNIQUE')) {
+      } else if (chain.eq('QUARTZ by UNIQUE') || chain.eq('SAPPHIRE by UNIQUE')) {
         requiredPallets.push(
           refungible,
           appPromotion,